Skip to content

Commit 2f8d7ef

Browse files
authored
compose: drop shared image tag in dev to avoid buildx build conflict (#279)
* compose: drop shared image tag in dev to avoid buildx build conflict * ci: update Docker image tags for web and worker services * ci: remove fail-fast strategy from CI workflow
1 parent 5e4aa3f commit 2f8d7ef

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
branches: [main]
77
jobs:
88
ci:
9-
strategy:
10-
fail-fast: false
119
runs-on: "ubuntu-latest"
1210
timeout-minutes: 15
1311
steps:
@@ -33,7 +31,11 @@ jobs:
3331
context: .
3432
target: development
3533
load: true
36-
tags: adit_dev:latest
34+
tags: |
35+
adit_dev-web:latest
36+
adit_dev-default_worker:latest
37+
adit_dev-dicom_worker:latest
38+
adit_dev-receiver:latest
3739
cache-from: type=gha
3840
cache-to: type=gha,mode=max
3941
- name: Start Docker containers

docker-compose.dev.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
x-app: &default-app
2-
image: adit_dev:latest
32
build:
43
target: development
54
pull_policy: build
@@ -29,6 +28,7 @@ services:
2928

3029
web:
3130
<<: *default-app
31+
image: adit_dev-web:latest
3232
ports:
3333
- ${WEB_DEV_PORT:-8000}:8000
3434
- ${REMOTE_DEBUGGING_PORT:-5678}:5678
@@ -50,6 +50,7 @@ services:
5050

5151
default_worker:
5252
<<: *default-app
53+
image: adit_dev-default_worker:latest
5354
command: >
5455
bash -c "
5556
wait-for-it -s postgres.local:5432 -t 60 &&
@@ -58,6 +59,7 @@ services:
5859
5960
dicom_worker:
6061
<<: *default-app
62+
image: adit_dev-dicom_worker:latest
6163
command: >
6264
bash -c "
6365
wait-for-it -s postgres.local:5432 -t 60 &&
@@ -66,6 +68,7 @@ services:
6668
6769
receiver:
6870
<<: *default-app
71+
image: adit_dev-receiver:latest
6972
ports:
7073
- 11122:11112
7174
command: |

0 commit comments

Comments
 (0)