Skip to content

Migration from Docker Compose v1 to v2 #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Progi1984 merged 1 commit into from
Apr 3, 2024
Merged

Migration from Docker Compose v1 to v2 #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ui-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
PS_VERSION: ${{ matrix.PS_VERSION }}
PHP_VERSION: ${{ matrix.PHP_VERSION }}
run: |
docker-compose -f "docker-compose.yml" up -d --build
docker compose -f "docker-compose.yml" up -d --build
bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost/en/)" != "200" ]]; do sleep 5; done'

- name: Install dependencies
Expand All @@ -79,7 +79,7 @@ jobs:
- name: Export Docker errors
working-directory: tests/UI/
if: always()
run: docker-compose logs --no-color >& docker-compose.log
run: docker compose logs --no-color >& docker-compose.log

- name: Upload artifact logs
uses: actions/upload-artifact@v4
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ db: docker-build
docker-build: build-back build-front

build-back:
docker-compose run --rm php sh -c "composer install"
docker compose run --rm php sh -c "composer install"

build-back-prod:
docker-compose run --rm php sh -c "composer install --no-dev -o"
docker compose run --rm php sh -c "composer install --no-dev -o"

build-front:
docker-compose run --rm node sh -c "npm install"
docker-compose run --rm node sh -c "npm run build"
docker compose run --rm node sh -c "npm install"
docker compose run --rm node sh -c "npm run build"