From 3d59b318814f3316171ede223eb79bb35fe22028 Mon Sep 17 00:00:00 2001
From: Yvo Brevoort <yvo@muze.nl>
Date: Mon, 2 Jun 2025 15:29:52 +0200
Subject: [PATCH 1/2] 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 <potherca@gmail.com>
Date: Mon, 2 Jun 2025 16:41:19 +0200
Subject: [PATCH 2/2] 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