Merge branch 'correctly-output-FORCE_BUILD-equals-true' into 'master'

Correctly output the $FORCE_BUILD=true message in custom-docker-build

See merge request gitlab-org/gitlab-build-images!279
This commit is contained in:
Stan Hu 2020-03-11 04:13:53 +00:00
commit 58bb4295ac

View file

@ -219,7 +219,7 @@ function build_custom_if_needed() {
if [[ "$FORCE_BUILD" == "true" ]] || ! image_already_exists $full_image_name; then
docker_command=$(generate_command $@)
if [[ "$FORCE_BUILD" == "true" ]]; then
echo "Force building $build_image_name due to `\$FORCE_BUILD=true` with $docker_command"
echo "Force building $build_image_name due to \$FORCE_BUILD=true with $docker_command"
else
echo "Building $build_image_name with $docker_command"
fi