Skip to content

Commit 381074f

Browse files
committed
CI: Replace Dockerfile path depending of the os used
1 parent 033a44f commit 381074f

File tree

2 files changed

+6
-59
lines changed

2 files changed

+6
-59
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,9 @@ jobs:
8787
matrix:
8888
include:
8989
- os: ubuntu-latest
90-
docker_compose_file: "docker-compose.yml"
9190
name: "AMD64"
9291
# GitHub doesn't have a ubuntu-latest-arm runner
9392
- os: ubuntu-24.04-arm
94-
docker_compose_file: "docker-compose-arm64.yml"
9593
name: "ARM64"
9694

9795
name: Test ${{ matrix.name }} Docker build
@@ -100,11 +98,15 @@ jobs:
10098
steps:
10199
- uses: actions/checkout@v4
102100

101+
- name: Use ARM64 Dockerfile if ARM64
102+
if: ${{ matrix.name }} == "ARM64"
103+
run: sed -i 's/Dockerfile/Dockerfile.arm64/' docker-compose.yml
104+
103105
- name: Build Docker
104-
run: docker compose -f ${{ matrix.docker_compose_file }} build
106+
run: docker compose build
105107

106108
- name: Run Docker
107-
run: docker compose -f ${{ matrix.docker_compose_file }} up -d
109+
run: docker compose up -d
108110

109111
- name: Test Docker
110112
run: while curl -Isf http://localhost:3000; do sleep 1; done

docker-compose-arm64.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)