diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 214c129..85b0c78 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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" diff --git a/docker-compose.oidc.yml b/docker-compose.oidc.yml new file mode 100644 index 0000000..65482e1 --- /dev/null +++ b/docker-compose.oidc.yml @@ -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 up +# Required for OAuth, Keycloak, and Login Flow profiles. +services: + app: + volumes: + - ./third_party:/opt/apps:ro diff --git a/docker-compose.yml b/docker-compose.yml index 455ecc1..3edabe6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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