fix(CI): Use the PHP version tag

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Jul 8, 2024 · 974b559 · 974b559
1 parent 81a43d3
commit 974b559
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0']
 
-    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
+    name: php${{ matrix.php-versions }}-smb-kerberos
 
     steps:
       - name: Checkout server
@@ -33,15 +33,15 @@ jobs:
       - name: Pull images
         run: |
           docker pull icewind1991/samba-krb-test-dc
-          docker pull icewind1991/samba-krb-test-apache
+          docker pull icewind1991/samba-krb-test-apache:${{ matrix.php-versions }}
           docker pull icewind1991/samba-krb-test-client
       - name: Setup AD-DC
         run: |
           cp apps/files_external/tests/*.sh .
           mkdir data
           sudo chown -R 33 data apps config
           DC_IP=$(./start-dc.sh)
-          ./start-apache.sh $DC_IP $PWD
+          ./start-apache.sh $DC_IP $PWD ${{ matrix.php-versions }}
           echo "DC_IP=$DC_IP" >> $GITHUB_ENV
       - name: Set up Nextcloud
         run: |

diff --git a/apps/files_external/tests/start-apache.sh b/apps/files_external/tests/start-apache.sh
@@ -2,7 +2,7 @@
 
 docker rm -f apache 2>/dev/null > /dev/null
 
-docker run -d --name apache -v $2:/var/www/html -v /tmp/shared:/shared --dns $1 --hostname httpd.domain.test icewind1991/samba-krb-test-apache 1>&2
+docker run -d --name apache -v $2:/var/www/html -v /tmp/shared:/shared --dns $1 --hostname httpd.domain.test icewind1991/samba-krb-test-apache:$3 1>&2
 APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}')
 
 # add the dns record for apache