Skip to content

Commit

Permalink
chore: migrate to docker compose v2
Browse files Browse the repository at this point in the history
  • Loading branch information
levalleux-ludo committed Aug 5, 2024
1 parent 996c7b3 commit a5aa242
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Build
run: |
npm run build -- --cache-dir=".turbo"
- run: cd e2e && docker-compose build && cd ..
- run: cd e2e && docker compose build && cd ..
# In this step, this action saves a list of existing images,
# the cache is created without them in the post run.
# It also restores the cache if it exists.
Expand Down
6 changes: 3 additions & 3 deletions e2e/run-e2e-services.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ call npm ci
cd ..
cd e2e

docker-compose up -d
docker compose up -d

echo *** Waiting for services... ***
timeout /t 15 /nobreak >nul
echo.

echo *** Deploying contracts... ***
docker-compose exec hardhat-node npm run deploy
docker compose exec hardhat-node npm run deploy
if %ERRORLEVEL% NEQ 0 (
echo Contracts couldn't be deployed
exit /B 1
Expand All @@ -34,6 +34,6 @@ echo *** Successfully deployed subgraph ***
echo.

set /p DUMMY=*** Press any key to shutdown services ***
docker-compose down -v
docker compose down -v
rmdir /S /Q .\data
cd ..
4 changes: 2 additions & 2 deletions e2e/run-e2e-services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
trap cleanup EXIT INT TERM

function cleanup() {
docker-compose down -v
docker compose down -v
rm -rf ./data
exit
}
Expand All @@ -14,7 +14,7 @@ npm ci
cd ..
cd e2e

docker-compose up -d #--build
docker compose up -d #--build

echo "Waiting for services..."
sleep 15
Expand Down
6 changes: 3 additions & 3 deletions e2e/run-e2e-suite.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ call npm ci
cd ..
cd e2e

docker-compose up -d
docker compose up -d

echo *** Waiting for services... ***
timeout /t 15 /nobreak >nul
echo.

echo *** Deploying contracts... ***
docker-compose exec hardhat-node npm run deploy
docker compose exec hardhat-node npm run deploy
if %ERRORLEVEL% NEQ 0 (
echo Contracts couldn't be deployed
exit /B 1
Expand All @@ -35,6 +35,6 @@ call npm run e2e:test -- --no-cache
set EXIT_STATUS=%ERRORLEVEL%

cd e2e
docker-compose down -v
docker compose down -v
cd ..
exit %EXIT_STATUS%
4 changes: 2 additions & 2 deletions e2e/run-e2e-suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ trap cleanup EXIT INT TERM
function cleanup() {
exit_status=$?
cd e2e
docker-compose down -v
docker compose down -v
exit "$exit_status"
}

Expand All @@ -15,7 +15,7 @@ npm ci
cd ..
cd e2e

docker-compose up -d
docker compose up -d

echo "Waiting for services..."
sleep 15
Expand Down

0 comments on commit a5aa242

Please sign in to comment.