Remove docker-compose-prod.yml

Makefile

@@ -27,20 +27,20 @@ ifeq ("$(wildcard ${DC})","")
 endif
 
 check-dc-config-%: check-prerequisites ## Check docker-compose syntax
-	${DC} -f docker-compose-$*.yml config -q
+	${DC} -f docker-compose.yml config -q
 
-build-%: check-dc-config-%
-	TAG=${TAG} ${DC} -f docker-compose-$*.yml build
+build: check-dc-config-%
+	TAG=${TAG} ${DC} -f docker-compose.yml build
 
-up-%: check-dc-config-%
+up: check-dc-config-%
 ifeq ("$(WORKSPACE)","preprod")
-	TAG=${TAG} PORT_PROD=8080 ${DC} -f docker-compose-$*.yml up -d
+	TAG=${TAG} PORT_PROD=8080 ${DC} -f docker-compose.yml up -d
 else
-	TAG=${TAG} ${DC} -f docker-compose-$*.yml up -d
+	TAG=${TAG} ${DC} -f docker-compose.yml up -d
 endif
 
-down-%:
-	${DC} -f docker-compose-$*.yml down
+down:
+	${DC} -f docker-compose.yml down
 
 tag: show-current-tag
 	git tag -a v${TAG}

README.md

@@ -28,27 +28,16 @@ See also [Debugging](https://github.com/datalab-mi/Basegun/blob/develop/backend/
 
 ```bash
 # install in dev mode
-make build-dev
-
-# install for prod/preprod
-make build-prod
+make build
 ```
 
 ### Launch the website
 ```bash
-# run in dev mode
-make up-dev
-
-# run prod mode on localhost
-WORKSPACE=preprod make up-prod
-
-# run in prod
-make up-prod
+# run
+make up
 
-# stop in dev
-make down-dev
-# stop in prod/preprod
-make down-prod
+# stop
+make down
 ```
 ## Debugging
 
@@ -68,7 +57,7 @@ Try to find error log
 ### The website runs the analysis, but no image shows up
 Use browser html inspector to find the url given in the image src.
 * If it starts with `https://storage.gra.cloud.ovh.net` then the website tried to upload the input image to OVH but it failed. Have you set properly in your env the variables OS_USERNAME, OS_PASSWORD and OS_PROJECT ?
-* If it starts with `https://localhost` then the website tried to store the input image locally. Have you synchronised the mounts for frontend and backend in [docker-compose-dev](https://github.com/datalab-mi/Basegun/blob/develop/backend/docker-compose-dev.yml) ? (uncomment the `/tmp/basegun` lines in the volumes sections)
+* If it starts with `https://localhost` then the website tried to store the input image locally. Have you synchronised the mounts for frontend and backend in [docker-compose](https://github.com/datalab-mi/Basegun/blob/develop/backend/docker-compose.yml) ? (uncomment the `/tmp/basegun` lines in the volumes sections)
 
 ### Logs are not sent to the endpoint
 The variables `X_OVH_TOKEN` and `API_OVH_TOKEN` must en set in your env. See [Infra README](https://github.com/datalab-mi/Basegun/blob/develop/infra/README.md) for more details.

frontend/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "preview": "vite preview",
     "build": "vite build",
-    "compose:up": "docker compose -f ../docker-compose-dev.yml --profile backend-only up -d",
+    "compose:up": "docker compose -f ../docker-compose.yml --profile backend-only up -d",
     "dev": "vite",
     "lint": "eslint src",
     "format": "eslint src --fix",

infra/legacy/README.md

@@ -7,7 +7,7 @@ This folder stores various contents related to Basegun deployment.
 
 1. Using Github actions, we trigger either the [*preprod* deployment](../../.github/workflows/develop.yml) or the [*prod* deployment](../../.github/workflows/release.yml).
 2. For both of them, the [workflow calls Terraform](../.github/workflows/deploy.yml) using specific env variables to differentiate preprod from prod, to start a VM on OVH public cloud.
-3. On the VM, we always have [3 containers](../docker-compose-prod.yml) :
+3. On the VM, we always have [3 containers](../docker-compose.yml) :
 * 1 for Basegun frontend (Vue.js website)
 * 1 for Basegun backend (Python API)
 * 1 for the log collector (Filebeat )  

infra/scripts/run.sh

@@ -2,7 +2,7 @@
 # Launch a cluster like the one in CI
 kind delete cluster
 
-TAG=$(make get-current-tag) BUILD_TARGET=test docker-compose -f docker-compose-prod.yml build
+TAG=$(make get-current-tag) BUILD_TARGET=dev docker-compose -f docker-compose.yml build
 kind create cluster --config ./infra/kube/kind/kind-config.yml
 
 helm repo add traefik https://traefik.github.io/charts && helm repo update