From 3d59b318814f3316171ede223eb79bb35fe22028 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 15:29:52 +0200 Subject: [PATCH 1/3] use main docker images --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d1a2ef3e..60f8d715 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -95,7 +95,7 @@ jobs: --rm \ --volume="./solid:/var/www/html/apps/solid" \ --workdir=/var/www/html/apps/solid \ - ghcr.io/pdsinterop/solid-nextcloud:179_merge-${{ matrix.nextcloud_version }} \ + ghcr.io/pdsinterop/solid-nextcloud:main-${{ matrix.nextcloud_version }} \ bin/phpunit --configuration phpunit.xml # 03.quality.php.scan.dependencies-vulnerabilities.yml From 8ad92018ca4a436fe91e1fc4eea688d727c37ace Mon Sep 17 00:00:00 2001 From: Ben Peachey Date: Mon, 2 Jun 2025 16:41:19 +0200 Subject: [PATCH 2/3] Add call for Nextcloud initialization to PHPUnit GitHub Action (GHA). --- .github/workflows/php.yml | 6 ++++-- Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 60f8d715..e18cf287 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -94,9 +94,11 @@ jobs: --env 'XDEBUG_MODE=coverage' \ --rm \ --volume="./solid:/var/www/html/apps/solid" \ - --workdir=/var/www/html/apps/solid \ ghcr.io/pdsinterop/solid-nextcloud:main-${{ matrix.nextcloud_version }} \ - bin/phpunit --configuration phpunit.xml + bash -c 'NEXTCLOUD_UPDATE=1 /entrypoint.sh "echo" \ + && sudo -u www-data bash /init.sh \ + && cd /var/www/html/apps/solid \ + && bin/phpunit --configuration phpunit.xml' # 03.quality.php.scan.dependencies-vulnerabilities.yml scan-dependencies-vulnerabilities: diff --git a/Dockerfile b/Dockerfile index a0a217c6..f8bf0509 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,8 +29,8 @@ COPY site.conf /etc/apache2/sites-enabled/000-default.conf COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN composer install --working-dir=/usr/src/nextcloud/apps/solid --no-dev --prefer-dist \ - && rm /usr/local/bin/composer +RUN composer install --working-dir=/usr/src/nextcloud/apps/solid --prefer-dist \ + && rm /usr/local/bin/composer WORKDIR /var/www/html EXPOSE 443 From 912abc1effb0fc20b215263f8baec54024551f38 Mon Sep 17 00:00:00 2001 From: Ben Peachey Date: Mon, 2 Jun 2025 17:09:38 +0200 Subject: [PATCH 3/3] Change hard-coded container name in GHA with context variable. --- .github/workflows/php.yml | 2 +- .github/workflows/solid-tests-suites.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index e18cf287..192a59f9 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -94,7 +94,7 @@ jobs: --env 'XDEBUG_MODE=coverage' \ --rm \ --volume="./solid:/var/www/html/apps/solid" \ - ghcr.io/pdsinterop/solid-nextcloud:main-${{ matrix.nextcloud_version }} \ + ghcr.io/${{ github.repository }}:main-${{ matrix.nextcloud_version }} \ bash -c 'NEXTCLOUD_UPDATE=1 /entrypoint.sh "echo" \ && sudo -u www-data bash /init.sh \ && cd /var/www/html/apps/solid \ diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 895d0fb4..a3fdb450 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -64,10 +64,10 @@ jobs: run: | docker build \ --tag "solid-nextcloud:${{ env.TAG }}" \ - --tag "ghcr.io/pdsinterop/solid-nextcloud:${{ env.TAG }}" \ + --tag "ghcr.io/${{ github.repository }}:${{ env.TAG }}" \ --build-arg 'NEXTCLOUD_VERSION=${{ matrix.nextcloud_version }}' \ . - docker push "ghcr.io/pdsinterop/solid-nextcloud:${{ env.TAG }}" + docker push "ghcr.io/${{ github.repository }}:${{ env.TAG }}" mkdir -p cache/solid-nextcloud docker image save solid-nextcloud:${{ env.TAG }} --output ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar