From 2066815295825f795d7caba9c4e2403ea8198517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Thu, 19 Sep 2024 16:21:26 +0200 Subject: [PATCH 1/4] [feature] Move menu-api in wp-ops's docker folder This also fix the "menu-api" not found on bare install --- Makefile | 9 +++++---- docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a50ee373..0b7942e4 100644 --- a/Makefile +++ b/Makefile @@ -162,8 +162,8 @@ checkout: \ $(WP_CONTENT_DIR)/mu-plugins \ $(WP_CLI_DIR) \ $(POLYLANG_CLI_DIR) \ - menu-api \ wp-ops \ + wp-ops/docker/menu-api \ volumes/usrlocalbin git_clone = mkdir -p $(dir $@) || true; devscripts/ensure-git-clone.sh $(_GITHUB_BASE)$(strip $(1)) $@; touch $@ @@ -282,8 +282,9 @@ wp-ops: $(call git_clone, epfl-si/wp-ops) $(MAKE) -C wp-ops checkout -wp-ops/ansible/ansible-deps-cache/bin/eyaml: wp-ops - ./wp-ops/ansible/wpsible -t nothing +wp-ops/docker/menu-api: wp-ops + $(call git_clone, epfl-si/wp-menu-api $@) +menu-api: wp-ops/docker/menu-api ################ Building or pulling Docker images ############### @@ -321,7 +322,7 @@ _S3_INSTALL_AUTO_FLAGS = \ .debug.s3: -@echo $(_S3_INSTALL_AUTO_FLAGS) -.docker-base-image-built.stamp: wp-ops/ansible/ansible-deps-cache/bin/eyaml $(_DOCKER_BASE_IMAGE_DEPS) +.docker-base-image-built.stamp: wp-ops/ansible/ansible-deps-cache/bin/eyaml menu-api $(_DOCKER_BASE_IMAGE_DEPS) [ -d wp-ops/docker/wp-base ] && \ docker build -t $(DOCKER_BASE_IMAGE_NAME) $(DOCKER_BASE_BUILD_ARGS) --build-arg INSTALL_AUTO_FLAGS="$(INSTALL_AUTO_FLAGS) $(_DEFAULT_INSTALL_AUTO_FLAGS)" wp-ops/docker/wp-base touch $@ diff --git a/docker-compose.yml b/docker-compose.yml index 144feef2..2109189e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -88,4 +88,4 @@ services: menu-api: container_name: menu-api - build: menu-api + build: wp-ops/docker/menu-api From 3ed36a49f41965fe5c093c8979a153468c12e1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Fri, 20 Sep 2024 09:44:00 +0200 Subject: [PATCH 2/4] [fix] Menu API's volumes --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2109189e..6bf1617a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,3 +89,6 @@ services: menu-api: container_name: menu-api build: wp-ops/docker/menu-api + volumes: + - ./wp-ops/docker/menu-api/menu-api-config.yaml:/config/menu-api-config.yaml + - ./wp-ops/docker/menu-api/data:/data From c01a5cd3e8e4b74c5986ef10ee64a9cb5e967a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Tue, 24 Sep 2024 12:59:28 +0200 Subject: [PATCH 3/4] [fix] Data path --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6bf1617a..66f2bd3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,4 +91,4 @@ services: build: wp-ops/docker/menu-api volumes: - ./wp-ops/docker/menu-api/menu-api-config.yaml:/config/menu-api-config.yaml - - ./wp-ops/docker/menu-api/data:/data + - ./wp-ops/docker/menu-api/data:/app/data From 522a50a28a76e9e67ed04064f73e6f50bb3a3b49 Mon Sep 17 00:00:00 2001 From: Dominique Quatravaux Date: Tue, 24 Sep 2024 17:01:05 +0200 Subject: [PATCH 4/4] [fix] make (no pun intended) `menu-api` target phony --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b7942e4..2872bb2a 100644 --- a/Makefile +++ b/Makefile @@ -282,9 +282,10 @@ wp-ops: $(call git_clone, epfl-si/wp-ops) $(MAKE) -C wp-ops checkout +.PHONY: menu-api +menu-api: wp-ops/docker/menu-api wp-ops/docker/menu-api: wp-ops $(call git_clone, epfl-si/wp-menu-api $@) -menu-api: wp-ops/docker/menu-api ################ Building or pulling Docker images ###############