Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[feature] Move menu-api in wp-ops's docker folder #91

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[feature] Move menu-api in wp-ops's docker folder #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2066815
[feature] Move menu-api in wp-ops's docker folder
ponsfrilus Sep 19, 2024
3ed36a4
[fix] Menu API's volumes
ponsfrilus Sep 20, 2024
c01a5cd
[fix] Data path
ponsfrilus Sep 24, 2024
522a50a
[fix] make (no pun intended) `menu-api` target phony
Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand Down Expand Up @@ -282,8 +282,10 @@ 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
.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 $@)

################ Building or pulling Docker images ###############

Expand Down Expand Up @@ -321,7 +323,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 $@
Expand Down
5 changes: 4 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,7 @@ services:

menu-api:
container_name: menu-api
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to make the theme works correctly, you should call the container_name: menu-api-siblings as it's the name used in the breadcrumb.php file

build: 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:/app/data