psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 14:41:07 -05:00
Code Issues Releases Wiki Activity

[Website-Makefile] Enable support for docker compose v2

Browse source 
Support using `docker compose` (docker compose v2) instead of
`docker-compose` (v1)

- Introduce `COMPOSE_V2` and `COMPOSE_COMMAND` variables
- Keep the default version at v1 (`COMPOSE_V2=0`)
- Refactor error message to expose that possibility

Signed-off-by: Nicolas signed-log FORMICHELLA <stigpro@outlook.fr>
This commit is contained in:
Nicolas signed-log FORMICHELLA 2022-08-28 19:11:28 +02:00
parent 5b3e5de331
commit c0aea3e683
No known key found for this signature in database
GPG key ID: 273140E170D76BA6
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Makefile
View file

@ -1,5 +1,12 @@
IGNORED = .jekyll-metadata Gemfile.lock _site IGNORED = .jekyll-metadata Gemfile.lock _site
VOLUME_ARG = VOLUME_ARG =
COMPOSE_V2 = 0
ifeq ($(COMPOSE_V2),1)
COMPOSE_COMMAND = docker compose
else
COMPOSE_COMMAND = docker-compose
endif
.PHONY: all .PHONY: all
all: all:
@ -44,11 +51,11 @@ usage:
.PHONY: test .PHONY: test
test: require-docker-compose clean test: require-docker-compose clean
docker-compose run --rm website test/validate $(COMPOSE_COMMAND) run --rm website test/validate
.PHONY: up .PHONY: up
up: require-docker-compose up: require-docker-compose
docker-compose up --no-recreate -d $(COMPOSE_COMMAND) up --no-recreate -d
@echo @echo
@echo Started docker container. It will probably take a bit of time before @echo Started docker container. It will probably take a bit of time before
@echo the webserver is listening. You can run \"make logs\" to watch the logs @echo the webserver is listening. You can run \"make logs\" to watch the logs
@ -58,15 +65,15 @@ up: require-docker-compose
.PHONY: logs .PHONY: logs
logs: require-docker-compose logs: require-docker-compose
docker-compose logs --tail 0 -f $(COMPOSE_COMMAND) logs --tail 0 -f
.PHONY: restart .PHONY: restart
restart: require-docker-compose restart: require-docker-compose
docker-compose restart $(COMPOSE_COMMAND) restart
.PHONY: down .PHONY: down
down: require-docker-compose down: require-docker-compose
docker-compose down --remove-orphans ${VOLUME_ARG} $(COMPOSE_COMMAND) down --remove-orphans ${VOLUME_ARG}
.PHONY: clean .PHONY: clean
clean: down clean: down
@ -78,9 +85,16 @@ fresh: clean
.PHONY: require-docker-compose .PHONY: require-docker-compose
require-docker-compose: require-docker require-docker-compose: require-docker
@if ! command -v "docker-compose" >/dev/null 2>&1; then \ @if [ "$(COMPOSE_V2)" = "0" ]; then \
echo "Sorry, this make target requires docker-compose to be installed."; \ if ! command -v "docker-compose" >/dev/null 2>&1; then \
echo "Sorry, this make target requires docker-compose to be installed. To use compose v2, re-run with COMPOSE_V2=1"; \
false; \ false; \
fi \
else \
if ! $(COMPOSE_COMMAND) >/dev/null 2>&1; then \
echo "Sorry, this make target has been configured to support docker compose v2 but the compose subcommand isn't present in docker. To use docker-compose v1, remove the COMPOSE_V2 switch"; \
false; \
fi \
fi fi
.PHONY: require-docker .PHONY: require-docker