Skip to content

Commit

Permalink
even more explicit use of --file flag
Browse files Browse the repository at this point in the history
  • Loading branch information
crstamps2 committed May 26, 2023
1 parent d8aa4bb commit ae82777
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions commands/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions commands/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/shared.bash
Original file line number Diff line number Diff line change
Expand Up @@ -272,4 +272,4 @@ function validate_tag {
else
return 1
fi
}
}

0 comments on commit ae82777

Please sign in to comment.