Merged
Conversation
…umes Each NC_BRANCH gets its own named volume (nc_data_master, nc_data_stable33, nc_data_stable34), so switching between NC versions during development preserves each branch's installed state — eurooffice config, files, sessions — instead of wiping on every switch. Usage: docker compose up -d nextcloud (master/NC34 trunk) NC_BRANCH=stable33 docker compose up -d nextcloud (NC33) Pairs with the develop stack's existing setup/shared/hooks/after-install.sh which configures eurooffice on every fresh-volume bring-up. The Makefile's `refresh-urls` target then aligns DocumentServerUrl + JWT after install. Co-Authored-By: Claude <claude@anthropic.com> Signed-off-by: James Manuel <moodyjmz@users.noreply.github.com>
setup/enable-office.sh is the post-installation hook for the official Nextcloud Docker Hub image (mounted to /docker-entrypoint-hooks.d/). Update it to enable and configure the eurooffice app instead of the upstream onlyoffice app, remove the stock onlyoffice app on first boot to avoid autoloader conflicts, and align the JWT secret with the value the document server container uses. Co-Authored-By: Claude <claude@anthropic.com> Signed-off-by: James Manuel <moodyjmz@users.noreply.github.com>
Reframe the dev compose around what 90% of work needs (current NC stable
from Docker Hub, fast boot, no version drift) and make the
nextcloud-docker-dev source-clone path opt-in via `make next` for
testing future NC versions only.
Compose:
- docker-compose.yml: parameterise NC image as `nextcloud:${NC_VERSION:-latest}`
so matrix testing against specific majors is `NC_VERSION=33 docker compose
up -d`. Fix a typo in a trusted_domains comment along the way.
- Rename docker-compose.override.yml → docker-compose.next.yml so it stops
auto-loading. `make local` now uses the base file directly → official
`nextcloud:latest` image, ~3s boot, no master/upgrade drift.
- docker-compose.next.yml: dynamic per-branch volume name via the
top-level `volumes.<name>.name` interpolation (`nc_data_${NC_BRANCH:-master}`).
Replaces the hardcoded list of three branch names — any NC_BRANCH value
now gets its own volume without yaml edits.
Makefile:
- New `next` target opts into the dev image with branch switching.
`make next` runs against master; `make next NC_BRANCH=stable33` etc.
- New `print-nc-version` helper queries `occ -V` and is called from `local`
and `next` so each run reports the NC version it landed on.
- Suppress the `Profiler output available at …` STDERR noise emitted
by occ on every CLI invocation in `refresh-urls`.
- Differentiate the two refresh-urls polling lines (eo vs nextcloud).
- `docker compose exec eo bash` exits cleanly if the container shell
returns non-zero (Ctrl+C or stray non-zero exit).
Bootstrap:
- New setup/shared/hooks/after-install.sh — equivalent of enable-office.sh
but for the nextcloud-docker-dev image's hook system (mounted at /shared).
Used only by `make next`; `make local` continues to use enable-office.sh
via /docker-entrypoint-hooks.d/.
README:
- New "Testing against a future Nextcloud version" section explaining
`make next` and per-branch volumes.
Co-Authored-By: Claude <claude@anthropic.com>
Signed-off-by: James Manuel <moodyjmz@users.noreply.github.com>
moodyjmz
force-pushed
the
feat/eurooffice-nextcloud-connector
branch
from
1768653 to
083f29c
Compare
chrip
approved these changes
May 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In conjunction with: Euro-Office/eurooffice-nextcloud#16
This makes it easier to switch NC versions.
Check the Readme changes for what to test :)