diff --git a/compose.modelscan.yaml b/compose.modelscan.yaml new file mode 100644 index 0000000000..ebefa4f07b --- /dev/null +++ b/compose.modelscan.yaml @@ -0,0 +1,11 @@ +name: bailo-prod + +services: + modelscan: + volumes: + - ./lib/modelscan_api/bailo_modelscan_api:/app/bailo_modelscan_api + image: bailo_modelscan:${INSTANCE_NAME} + pull_policy: build + build: + context: ./lib/modelscan_api + target: dev diff --git a/compose.override.yaml b/compose.override.yaml index bb7dbbbf7f..e0aa9e8d92 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -26,18 +26,16 @@ services: - ./backend/src:/app/src build: target: dev + image: bailo_backend:${INSTANCE_NAME} + pull_policy: build frontend: volumes: - ./frontend:/app build: target: dev - - modelscan: - volumes: - - ./lib/modelscan_api/bailo_modelscan_api:/app/bailo_modelscan_api - build: - target: dev + image: bailo_frontend:${INSTANCE_NAME} + pull_policy: build minio: environment: diff --git a/compose.prod.yaml b/compose.prod.yaml index 891d7d96a2..b8bedcbffc 100644 --- a/compose.prod.yaml +++ b/compose.prod.yaml @@ -1 +1,9 @@ name: bailo-prod + +services: + frontend: + image: ghcr.io/gchq/bailo_frontend:latest + pull_policy: missing + backend: + image: ghcr.io/gchq/bailo_backend:latest + pull_policy: missing diff --git a/compose.yaml b/compose.yaml index 2fd4433504..942aa7e22f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -59,9 +59,7 @@ services: modelscan: networks: internal: - image: bailo_modelscan:${INSTANCE_NAME} - build: - context: ./lib/modelscan_api + image: ghcr.io/gchq/bailo_modelscan:latest volumes: - ./lib/modelscan_api/bailo_modelscan_api:/app/bailo_modelscan_api healthcheck: @@ -107,7 +105,6 @@ services: frontend: networks: internal: - image: bailo_frontend:${INSTANCE_NAME} build: context: ./frontend/ depends_on: @@ -116,7 +113,6 @@ services: backend: networks: internal: - image: bailo_backend:${INSTANCE_NAME} build: context: ./backend/ additional_contexts: diff --git a/lib/modelscan_api/README.md b/lib/modelscan_api/README.md index 57c8203000..c9058f8c6b 100644 --- a/lib/modelscan_api/README.md +++ b/lib/modelscan_api/README.md @@ -24,6 +24,10 @@ by using `--target dev` or `--target prod` respectively (targeting prod is optio Note that the Docker containers run on port `3311` rather than `8000`, so adjust URLs accordingly. +When using with the wider project's docker compose structure, you can use the +[compose.modelscan.yaml](../../compose.modelscan.yaml) profile (`compose [...] -f compose.modelscan.yaml`) to switch to +the local/live development version. + ## Setup