From 2c7f7d21b0e8ee1931b7dd45e9a00ed47ba65fe1 Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Tue, 3 Sep 2024 14:49:49 -0500 Subject: [PATCH] Fix docker compose syntax. --- .github/workflows/ci.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5653b9966..46b4c97ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,12 @@ jobs: run: | echo "${{ secrets.COMPOSER_ENV }}" > .env + - name: Create auth.json + uses: jsdaniell/create-json@v1.2.3 + with: + name: 'auth.json' + json: ${{ secrets.COMPOSER_AUTH_JSON }} + - name: Create local config run: | php -r "file_exists( 'local-config.php' ) || copy( 'local-config-sample.php', 'local-config.php' );" @@ -72,11 +78,11 @@ jobs: working-directory: dev/docker - name: Start project containers - run: docker-compose --project-name=${{ env.PROJECT_ID }} up -d --force-recreate + run: docker compose --project-name=${{ env.PROJECT_ID }} up -d --force-recreate working-directory: dev/docker - name: Install composer dependencies - run: docker-compose --project-name=${{ env.PROJECT_ID }} exec -T php-fpm composer install --optimize-autoloader -d /application/www + run: docker compose --project-name=${{ env.PROJECT_ID }} exec -T php-fpm composer install --optimize-autoloader -d /application/www working-directory: dev/docker - name: Set up node @@ -108,19 +114,19 @@ jobs: chmod -R 777 ${{ github.workspace }}/cache/ - name: Run unit tests - run: docker-compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept --config "/application/www/dev/tests" run unit + run: docker compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept --config "/application/www/dev/tests" run unit working-directory: dev/docker - name: Run integration tests - run: docker-compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept --config "/application/www/dev/tests" run integration + run: docker compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept --config "/application/www/dev/tests" run integration working-directory: dev/docker - name: Run acceptance tests - run: docker-compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept --config "/application/www/dev/tests" run acceptance + run: docker compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept --config "/application/www/dev/tests" run acceptance working-directory: dev/docker - name: Run webdriver tests - run: docker-compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept -vvv --config "/application/www/dev/tests" run webdriver + run: docker compose --project-name=${{ env.PROJECT_ID }} exec -T php-tests php /application/www/vendor/bin/codecept -vvv --config "/application/www/dev/tests" run webdriver working-directory: dev/docker - uses: actions/upload-artifact@v2