aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2024-04-19 12:46:09 +0200
committerSergey Poznyakoff <gray@gnu.org>2024-04-19 12:46:09 +0200
commit4a44e6a215bd9577a9bcabe5d23e0714a46ab914 (patch)
tree94b31927a0bfd1f778084dd9c3c6448640feb434
parente344fc2ce33ee3bba97f1d459b5e6e732345ba6b (diff)
downloadweb-master.tar.gz
web-master.tar.bz2
Optionally include configuration from local.ymlHEADmastergcidedock
-rw-r--r--.gitignore1
-rw-r--r--GNUmakefile8
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 07fc363..28da172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.emacs*
.env
+local.yml
*~
\#*
diff --git a/GNUmakefile b/GNUmakefile
index 1f35b28..e5e91b5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,15 +1,19 @@
PROJECT = gcidedock
-command = docker compose -p $(PROJECT) -f dicodock/docker-compose.yml -f docker-compose.override.yml
-
+command = docker compose -p $(PROJECT) \
+ -f dicodock/docker-compose.yml \
+ -f docker-compose.override.yml
+ifneq (,$(wildcard local.yml))
+ command += -f local.yml
+endif
ifneq (,$(wildcard .env))
command += --env-file .env
include .env
ifneq (,$(PROFILE))
command += --profile $(PROFILE)
endif
endif
define goal =
$(1):
$$(command) $(1)$(if $(filter-out up, $(1)),, -d)

Return to:

Send suggestions and report system problems to the System administrator.