fix(CI): Use the PHP version tag

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Jul 8, 2024 · 1a71b3c · 1a71b3c
1 parent 81a43d3
commit 1a71b3c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 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,33 +33,40 @@ 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: |
           docker exec --user 33 apache ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
           docker exec --user 33 apache ./occ config:system:set trusted_domains 1 --value 'httpd.domain.test'
 
-          # setup user_saml
+      - name: Set up user_saml
+        run: |
+          # Avoid DNS issue inside the image
+          docker exec --user 33 apache ./occ config:system:set allow_local_remote_servers --value true --type bool
           docker exec --user 33 apache ./occ app:enable user_saml --force
+          docker exec --user 33 apache ./occ config:system:delete allow_local_remote_servers
           docker exec --user 33 apache ./occ config:app:set user_saml type --value 'environment-variable'
           docker exec --user 33 apache ./occ saml:config:create
           docker exec --user 33 apache ./occ saml:config:set 1 --general-uid_mapping=REMOTE_USER
 
-          # setup external storage
+      - name: Set up files_external
+        run: |
           docker exec --user 33 apache ./occ app:enable files_external --force
           docker exec --user 33 apache ./occ files_external:create smb smb smb::kerberosapache
           docker exec --user 33 apache ./occ files_external:config 1 host krb.domain.test
           docker exec --user 33 apache ./occ files_external:config 1 share netlogon
           docker exec --user 33 apache ./occ files_external:list
+
       - name: Test SSO
         run: |
           mkdir /tmp/shared/cookies

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