From cb302c487e54362024aa4bffcc0f3759499ba281 Mon Sep 17 00:00:00 2001
From: dantefromhell <90508808+dantefromhell@users.noreply.github.com>
Date: Tue, 6 Aug 2024 23:23:24 +0000
Subject: [PATCH] fix: docker-compose v1 deprecation (#117)

* fix: docker-compose v1 deprecation

This feature has been removed from the ubuntu images, see https://github.blog/changelog/2024-04-10-github-hosted-runner-images-deprecation-notice-docker-compose-v1/

* Fix container names
---
 .github/workflows/build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3292e99..e1491867 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -115,24 +115,24 @@ jobs:
       - name: replace image
         run: sed -i "s/docker.io\/mriedmann\/humhub:latest/ghcr.io\/${CI_REPOSITORY_OWNER}\/humhub:${CI_REF_NAME_SLUG}-${HUMHUB_VERSION}-git-${GIT_REV}-allinone/g" docker-compose.yml
       - name: Spin up services
-        run: docker-compose -f docker-compose.yml up -d
+        run: docker compose -f docker-compose.yml up -d
       - name: Wait 
         run: sleep 120
       - name: Check status
         run: docker ps -a
       - name: Collect startup logs from all containers
-        run: docker-compose -f docker-compose.prod.yml logs
+        run: docker compose -f docker-compose.prod.yml logs
       - name: Setup upterm SSH debugging
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.ssh_debug_enabled }}
       - name: Test
         run: curl 'http://localhost:8080/' --location --fail --silent | grep 'Sign in</button>' -q || ( curl 'http://localhost:8080/'  --trace - ; exit 1;)
       - name: Test Email
-        run: docker-compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email 'test@example.com' --interactive=0 \
+        run: docker compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email 'test@example.com' --interactive=0 \
           | grep 'Message successfully sent!' -q
       - name: Collect HumHub server logs
         if: ${{ always() }}
-        run: docker logs humhub-docker_humhub_1
+        run: docker logs humhub-docker-humhub-1
 
   test_prod:
     needs: build_variants
@@ -169,13 +169,13 @@ jobs:
           sed -i "s/docker.io\/mriedmann\/humhub:stable-nginx/ghcr.io\/${CI_REPOSITORY_OWNER}\/humhub:${CI_REF_NAME_SLUG}-${HUMHUB_VERSION}-git-${GIT_REV}-nginx/g" docker-compose.prod.yml
           sed -i "s/docker.io\/mriedmann\/humhub:stable-phponly/ghcr.io\/${CI_REPOSITORY_OWNER}\/humhub:${CI_REF_NAME_SLUG}-${HUMHUB_VERSION}-git-${GIT_REV}-phponly/g" docker-compose.prod.yml
       - name: Spin up services
-        run: docker-compose -f docker-compose.prod.yml up -d
+        run: docker compose -f docker-compose.prod.yml up -d
       - name: Wait 
         run: sleep 120
       - name: Check status
         run: docker ps -a
       - name: Collect startup logs from all containers
-        run: docker-compose -f docker-compose.prod.yml logs
+        run: docker compose -f docker-compose.prod.yml logs
       - name: Setup upterm SSH debugging
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.ssh_debug_enabled }}
@@ -183,11 +183,11 @@ jobs:
         run: curl 'http://localhost:8080/' --location --fail --silent | grep 'Sign in</button>' -q || ( curl 'http://localhost:8080/'  --trace - ; exit 1;)
       - name: Test Email
         run: |
-          docker-compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email 'test@example.com' --interactive=0 \
+          docker compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email 'test@example.com' --interactive=0 \
             | grep 'Message successfully sent!' -q
       - name: Collect HumHub server logs
         if: ${{ always() }}
-        run: docker logs humhub-docker_humhub_1
+        run: docker logs humhub-docker-humhub-1
 
   push_ghcr:
     needs: ["test_aio", "test_prod"]