Skip to content

Commit a2a250e

Browse files
Move modelscan 'build' to a separate compose file. Default to pull modelscan image from GHCR
1 parent 6abd464 commit a2a250e

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed

compose.modelscan.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: bailo-prod
2+
3+
services:
4+
modelscan:
5+
volumes:
6+
- ./lib/modelscan_api/bailo_modelscan_api:/app/bailo_modelscan_api
7+
image: bailo_modelscan:${INSTANCE_NAME}
8+
pull_policy: build
9+
build:
10+
context: ./lib/modelscan_api
11+
target: dev

compose.override.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,16 @@ services:
2626
- ./backend/src:/app/src
2727
build:
2828
target: dev
29+
image: bailo_backend:${INSTANCE_NAME}
30+
pull_policy: build
2931

3032
frontend:
3133
volumes:
3234
- ./frontend:/app
3335
build:
3436
target: dev
35-
36-
modelscan:
37-
volumes:
38-
- ./lib/modelscan_api/bailo_modelscan_api:/app/bailo_modelscan_api
39-
build:
40-
target: dev
37+
image: bailo_frontend:${INSTANCE_NAME}
38+
pull_policy: build
4139

4240
minio:
4341
environment:

compose.prod.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
11
name: bailo-prod
2+
3+
services:
4+
frontend:
5+
image: ghcr.io/gchq/bailo_frontend:v2.10.0
6+
pull_policy: missing
7+
backend:
8+
image: ghcr.io/gchq/bailo_backend:v2.10.0
9+
pull_policy: missing

compose.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,19 @@ services:
5151
networks:
5252
internal:
5353
healthcheck:
54-
test: ['CMD-SHELL', "echo 'PING' | nc -w 5 localhost 3310"]
54+
test: ["CMD-SHELL", "echo 'PING' | nc -w 5 localhost 3310"]
5555
interval: 30s
5656
timeout: 10s
5757
retries: 5
5858

5959
modelscan:
6060
networks:
6161
internal:
62-
image: bailo_modelscan:${INSTANCE_NAME}
63-
build:
64-
context: ./lib/modelscan_api
62+
image: ghcr.io/gchq/bailo_modelscan:3.0.0
6563
volumes:
6664
- ./lib/modelscan_api/bailo_modelscan_api:/app/bailo_modelscan_api
6765
healthcheck:
68-
test: ['CMD-SHELL', 'curl --fail http://127.0.0.1:3311/info || exit 1']
66+
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:3311/info || exit 1"]
6967
interval: 30s
7068
timeout: 10s
7169
retries: 5
@@ -107,7 +105,6 @@ services:
107105
frontend:
108106
networks:
109107
internal:
110-
image: bailo_frontend:${INSTANCE_NAME}
111108
build:
112109
context: ./frontend/
113110
depends_on:
@@ -116,7 +113,6 @@ services:
116113
backend:
117114
networks:
118115
internal:
119-
image: bailo_backend:${INSTANCE_NAME}
120116
build:
121117
context: ./backend/
122118
additional_contexts:

0 commit comments

Comments
 (0)