Fix so that dev.yml isn't needed for make run

Signed-off-by: John Gomersall <[email protected]>
openfoodfacts · Jun 28, 2024 · d478edb · d478edb
1 parent 5593ae9
commit d478edb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.env b/.env
@@ -6,7 +6,7 @@ KEYCLOAK_REALM_NAME=open-products-facts
 KEYCLOAK_TAG=main
 COMPOSE_PROJECT_NAME=openfoodfacts-auth
 COMPOSE_PATH_SEPARATOR=,
-COMPOSE_FILE=docker-compose.yml,docker-compose-run.yml,docker/dev.yml
+COMPOSE_FILE=docker-compose.yml,docker-compose-run.yml
 
 KC_DB_USERNAME=keycloak
 KC_DB_PASSWORD=Secret123!

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ build:
 	node build-scripts/build_languages.mjs
 	mkdir -p target
 	set -o allexport; source .env; set +o allexport; envsubst \$$PRODUCT_OPENER_OIDC_CLIENT_ID,\$$PRODUCT_OPENER_DOMAIN,\$$PRODUCT_OPENER_OIDC_CLIENT_SECRET,\$$REDIS_URL < conf/open-products-facts-realm.json > target/open-products-facts-realm.json
-	docker compose up -d --build
+	COMPOSE_FILE=${COMPOSE_FILE},docker/dev.yml docker compose up -d --build
 
 up:
 	docker compose up -d

diff --git a/docker/dev.yml b/docker/dev.yml
@@ -1,6 +1,5 @@
 services:
   keycloak:
-    image: ghcr.io/openfoodfacts/openfoodfacts-auth:dev
     build:
       context: .
       dockerfile: Dockerfile