Skip to content

Commit

Permalink
Docker Compose specification mention
Browse files Browse the repository at this point in the history
  • Loading branch information
back-2-95 committed Jan 24, 2024
1 parent 06bdd72 commit f1a1821
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion make/docker.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLI_SERVICE := app
CLI_SHELL := sh
# Note: specification says this file would be compose.yaml
DOCKER_COMPOSE_YML_PATH ?= docker-compose.yml
DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no)
DOCKER_PROJECT_ROOT ?= /app
Expand Down Expand Up @@ -75,7 +76,7 @@ endif

ifeq ($(RUN_ON),docker)
define docker_compose
@docker compose$(if $(filter docker-compose.yml,$(DOCKER_COMPOSE_YML_PATH)),, -f $(DOCKER_COMPOSE_YML_PATH)) $(1)
@docker compose$(if $(filter $(DOCKER_COMPOSE_YML_PATH),$(DOCKER_COMPOSE_YML_PATH)),, -f $(DOCKER_COMPOSE_YML_PATH)) $(1)
endef
else
define docker_compose
Expand Down

0 comments on commit f1a1821

Please sign in to comment.