summaryrefslogtreecommitdiff
path: root/bin/compose
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2024-12-25 10:58:01 -0500
committerFreya Murphy <freya@freyacat.org>2024-12-25 10:58:01 -0500
commitd929d8de67edc8881828bddfc817acebaf5d6e80 (patch)
treeb972e8c391f17f27c9a3d3ef11eb7ed98b2378f9 /bin/compose
parentrework tooling to make environement loading easier (diff)
downloadcrimson-d929d8de67edc8881828bddfc817acebaf5d6e80.tar.gz
crimson-d929d8de67edc8881828bddfc817acebaf5d6e80.tar.bz2
crimson-d929d8de67edc8881828bddfc817acebaf5d6e80.zip
enable use of docker-compose.override.yml
Diffstat (limited to 'bin/compose')
-rwxr-xr-xbin/compose13
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/compose b/bin/compose
index 20c9992..34df8fe 100755
--- a/bin/compose
+++ b/bin/compose
@@ -69,12 +69,12 @@ docker_env_files="[$(echo "$ENV_FILES" | tr ':' "\n" | sed 's/.*/"&"/' | tr '\n'
function include_docker {
local name src dest bool
- name="docker-compose.$1.yml"
- src="$CRIMSON_ROOT/docker/$name"
+ name="$(basename "$1")"
+ src="$1"
dest="/tmp/crimson/docker/$name"
bool="$2"
- if [[ "$bool" == "true" ]]; then
+ if [[ "$bool" == "true" ]] && [[ -f "$src" ]]; then
mkdir -p "$(dirname "$dest")"
sed "s#DOCKER_ENV_FILES#$docker_env_files#" "$src" > "$dest"
@@ -83,9 +83,10 @@ function include_docker {
fi
}
-include_docker "base" "true"
-include_docker "db" "$POSTGRES_ENABLED"
-include_docker "api" "$API_ENABLED"
+include_docker "$CRIMSON_ROOT/docker/docker-compose.base.yml" "true"
+include_docker "$CRIMSON_ROOT/docker/docker-compose.db.yml" "$POSTGRES_ENABLED"
+include_docker "$CRIMSON_ROOT/docker/docker-compose.api.yml" "$API_ENABLED"
+include_docker "$PROJECT_ROOT/docker-compose.override.yml" "true"
# set project name