Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rework docker compose script to allow future extensibility #1002

Merged
merged 4 commits into from
Nov 22, 2023
Merged

rework docker compose script to allow future extensibility #1002

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aef9ba7
rework docker compose script to allow future extensibility
piotrkwiecinski Nov 10, 2023
c8621f7
prevent globing and word splitting
piotrkwiecinski Nov 10, 2023
fc3870d
add clarification
piotrkwiecinski Nov 22, 2023
10f07b7
More verbose documentation with comments
markshust Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions compose/bin/docker-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,23 @@ else
DOCKER_COMPOSE="docker-compose"
fi

COMPOSE_FILES=("compose.yaml" "compose.healthcheck.yaml")

# If --no-dev is passed to this script, we won't load the compose.dev.yaml file,
# but this argument should be removed so it isn't passed to docker compose.
if [ "$1" == "--no-dev" ]; then
${DOCKER_COMPOSE} -f compose.yaml -f compose.healthcheck.yaml "${@:2}"
# Remove the "--no-dev" argument so it isn't passed to docker compose
shift 1
else
${DOCKER_COMPOSE} -f compose.yaml -f compose.healthcheck.yaml -f compose.dev.yaml "$@"
# The "--no-dev" argument wasn't passed in, so let's load the dev config.
COMPOSE_FILES+=("compose.dev.yaml")
fi

# Loop over the list of compose files, and prefix them with -f.
# This ensures paths with spaces aren't split when passed as parameters.
COMPOSE_FILES_PREFIXED=()
markshust marked this conversation as resolved.
Show resolved Hide resolved
for file in "${COMPOSE_FILES[@]}"; do
COMPOSE_FILES_PREFIXED+=("-f" "$file")
done

${DOCKER_COMPOSE} "${COMPOSE_FILES_PREFIXED[@]}" "$@"
Loading