Merge pull request #143 from Bugfighter/b-6.5.x

Fix github workflows docker compose
OXID-eSales · Jan 28, 2025 · cfef501 · cfef501
2 parents 3fc98d4 + ee34c85
commit cfef501
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -71,24 +71,24 @@ jobs:
 
       - name: Install module
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             php composer config repositories.${{ env.PACKAGE_NAME }} \
             --json '{"type":"path", "url":"./test-module", "options": {"symlink": true}}'
-          docker-compose exec -T \
+          docker compose exec -T \
             php composer require ${{ env.PACKAGE_NAME }}:* --no-interaction --no-update
 
       - name: Install dependencies and reset shop
         run: |
-          docker-compose exec -T php composer update --no-interaction
-          docker-compose exec -T php composer require vlucas/phpdotenv --no-interaction --dev
-          docker-compose exec -T php php vendor/bin/reset-shop
+          docker compose exec -T php composer update --no-interaction
+          docker compose exec -T php composer require vlucas/phpdotenv --no-interaction --dev
+          docker compose exec -T php php vendor/bin/reset-shop
 
       - name: Put module settings
         continue-on-error: true
         run: |
           mkdir -p source/var/configuration/environment/
           echo "${{ secrets.MODULE_SETTINGS }}" > source/var/configuration/environment/1.yaml
-          docker-compose exec -T php php bin/oe-console oe:module:apply-configuration
+          docker compose exec -T php php bin/oe-console oe:module:apply-configuration
 
       - name: Create .env-file
         continue-on-error: true
@@ -98,7 +98,7 @@ jobs:
 
       - name: Stop containers
         run: |
-          docker-compose down
+          docker compose down
           sleep 2
 
   styles:
@@ -175,7 +175,7 @@ jobs:
 
       - name: Run tests
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             -e PARTIAL_MODULE_PATHS=${{ env.MODULE_PATH }} \
             -e ACTIVATE_ALL_MODULES=1 \
             -e RUN_TESTS_FOR_SHOP=0 \
@@ -224,13 +224,13 @@ jobs:
 
       - name: Install codeception dependencies
         run: |
-          docker-compose exec -T php composer require codeception/module-rest:^1.4.2 --dev --no-update
-          docker-compose exec -T php composer require codeception/module-phpbrowser:^1.0.2 --dev --no-update
-          docker-compose exec -T php composer update
+          docker compose exec -T php composer require codeception/module-rest:^1.4.2 --dev --no-update
+          docker compose exec -T php composer require codeception/module-phpbrowser:^1.0.2 --dev --no-update
+          docker compose exec -T php composer update
 
       - name: Run tests
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             -e PARTIAL_MODULE_PATHS=${{ env.MODULE_PATH }} \
             -e ACTIVATE_ALL_MODULES=1 \
             -e RUN_TESTS_FOR_SHOP=0 \
@@ -241,7 +241,7 @@ jobs:
       - name: Stop containers
         if: always()
         run: |
-          docker-compose down
+          docker compose down
           sleep 2
 
       - name: Upload log artifact
@@ -301,4 +301,4 @@ jobs:
             -Dsonar.php.coverage.reportPaths=tests/coverage.xml
             -Dsonar.php.phpstan.reportPaths=styles/phpstan.report.json
             -Dsonar.cpd.php.minimumTokens=25
-            -Dsonar.cpd.php.minimumLines=5
+            -Dsonar.cpd.php.minimumLines=5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## FIX
+- Fix github workflows docker compose
+
 ## [1.1.8] - 2024-11-19
 
 ### FIX