Update configuration

City-of-Helsinki · Jan 25, 2024 · 07a096f · 07a096f
1 parent 53e0afc
commit 07a096f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/imagemagick.settings.yml b/conf/cmi/imagemagick.settings.yml
@@ -6,7 +6,6 @@ path_to_binaries: ''
 prepend: ''
 log_warnings: true
 debug: false
-locale: en_US.UTF-8
 advanced:
   density: 0
   colorspace: '0'

diff --git a/tools/make/docker.mk b/tools/make/docker.mk
@@ -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
@@ -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