fix(ci): revert accidental third_party mount, use compose override for OIDC
The third_party:/opt/apps volume was accidentally uncommented in docker-compose.yml. Without submodules checked out, this empty mount breaks the Notes app installation hook in CI. Fix: keep the mount commented in docker-compose.yml and add a separate docker-compose.oidc.yml override that's only used for OIDC-requiring profiles (oauth, login-flow) in CI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -78,10 +78,11 @@ jobs:
|
||||
composer install --no-dev
|
||||
|
||||
# Start services with the appropriate profile
|
||||
# OIDC modes need the override file to mount third_party into Nextcloud
|
||||
- name: Run docker compose
|
||||
uses: hoverkraft-tech/compose-action@4894d2492015c1774ee5a13a95b1072093087ec3 # v2.5.0
|
||||
with:
|
||||
compose-file: "./docker-compose.yml"
|
||||
compose-file: ${{ matrix.needs-oidc && './docker-compose.yml\n./docker-compose.oidc.yml' || './docker-compose.yml' }}
|
||||
compose-flags: "--profile ${{ matrix.profile }}"
|
||||
up-flags: "--build"
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
# Override to mount the OIDC app into Nextcloud.
|
||||
# Use with: docker compose -f docker-compose.yml -f docker-compose.oidc.yml --profile <profile> up
|
||||
# Required for OAuth, Keycloak, and Login Flow profiles.
|
||||
services:
|
||||
app:
|
||||
volumes:
|
||||
- ./third_party:/opt/apps:ro
|
||||
+1
-1
@@ -35,7 +35,7 @@ services:
|
||||
- ./app-hooks:/docker-entrypoint-hooks.d:ro
|
||||
# Mount OIDC development directory outside /var/www/html to avoid rsync conflicts
|
||||
# The post-installation hook will register /opt/apps as an additional app directory
|
||||
- ./third_party:/opt/apps:ro
|
||||
#- ./third_party:/opt/apps:ro
|
||||
environment:
|
||||
- NEXTCLOUD_TRUSTED_DOMAINS=app
|
||||
- NEXTCLOUD_ADMIN_USER=admin
|
||||
|
||||
Reference in New Issue
Block a user