From ae8277753dbad33d638b16a1dfb66a7340ff6e9d Mon Sep 17 00:00:00 2001 From: Cody Stamps Date: Fri, 26 May 2023 14:37:03 -0400 Subject: [PATCH] even more explicit use of --file flag --- commands/build.sh | 4 ++-- commands/run.sh | 6 +++--- lib/shared.bash | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commands/build.sh b/commands/build.sh index 1c0dcedd..976e639f 100755 --- a/commands/build.sh +++ b/commands/build.sh @@ -191,11 +191,11 @@ while read -r arg ; do done <<< "$(plugin_read_list ARGS)" echo "+++ :docker: Building services ${services[*]}" -run_docker_compose -f "$override_file" "${build_params[@]}" "${services[@]}" +run_docker_compose --file "$override_file" "${build_params[@]}" "${services[@]}" if [[ -n "$image_repository" ]] ; then echo "~~~ :docker: Pushing built images to $image_repository" - retry "$push_retries" run_docker_compose -f "$override_file" push "${services[@]}" + retry "$push_retries" run_docker_compose --file "$override_file" push "${services[@]}" # iterate over build images while [[ ${#build_images[@]} -gt 0 ]] ; do diff --git a/commands/run.sh b/commands/run.sh index 5b51047d..0d2c7f9e 100755 --- a/commands/run.sh +++ b/commands/run.sh @@ -57,9 +57,9 @@ done if [[ ${#prebuilt_services[@]} -gt 0 ]] ; then echo "~~~ :docker: Creating docker-compose override file for prebuilt services" build_image_override_file "${prebuilt_service_overrides[@]}" | tee "$override_file" - run_params+=(-f "$override_file") - pull_params+=(-f "$override_file") - up_params+=(-f "$override_file") + run_params+=(--file "$override_file") + pull_params+=(--file "$override_file") + up_params+=(--file "$override_file") fi # If there are multiple services to pull, run it in parallel (although this is now the default) diff --git a/lib/shared.bash b/lib/shared.bash index 03b8de8c..fa5d9748 100644 --- a/lib/shared.bash +++ b/lib/shared.bash @@ -272,4 +272,4 @@ function validate_tag { else return 1 fi -} \ No newline at end of file +}