Skip to content

Commit

Permalink
build.sh: correctly use quoted $BUILD_OPTIONS
Browse files Browse the repository at this point in the history
Previously we built the (centos only?) image label like this:

  "io.openshift.builder-version": "\"7ab45d0\"",

... which was wrong, but it did not hurt Docker.  Now
buildah/podman complaints:

Error: invalid argument
"io.openshift.builder-version=\"7ab45d0\"" for "--label" flag:
parse error on line 1, column 29: bare " in non-quoted-field
  • Loading branch information
praiskup authored and pkubatrh committed Mar 7, 2019
1 parent f7fbbb3 commit ebb067a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function docker_build_with_version {
fi
fi

parse_output 'docker build $BUILD_OPTIONS -f "$dockerfile" "${DOCKER_BUILD_CONTEXT}"' \
parse_output 'docker build '"$BUILD_OPTIONS"' -f "$dockerfile" "${DOCKER_BUILD_CONTEXT}"' \
"tail -n 1 | awk '/Successfully built|^--> (Using cache )?[a-fA-F0-9]+$/{print \$NF}'" \
IMAGE_ID
clean_image
Expand Down

0 comments on commit ebb067a

Please sign in to comment.