rename Dockerfile build-arg VERSION to PRODUCT_VERSION #14369
Conversation
alvin-huang
requested review from
samsalisbury and
hc-github-team-secure-vault-core
and removed request for
hc-github-team-secure-vault-core
Makefile
Outdated
|
|
||
| docker-dev-ui: prep | ||
| docker build --build-arg VERSION=$(GO_VERSION_MIN) --build-arg BUILD_TAGS="$(BUILD_TAGS)" -f scripts/docker/Dockerfile.ui -t vault:dev-ui . | ||
| docker build --build-arg PRODUCT_VERSION=$(GO_VERSION_MIN) --build-arg BUILD_TAGS="$(BUILD_TAGS)" -f scripts/docker/Dockerfile.ui -t vault:dev-ui . |
There was a problem hiding this comment.
This and the target above seem to be referencing ./scripts/docker/Dockerfile[.ui] so they shouldn't need updating based on the change to the ./Dockerfile as far as I can see. The VERSION in these Dockerfiles is the Go version, as opposed to the product version. (This is why I always use PRODUCT_VERSION for the product version, not just VERSION as it helps to disambiguate all the different things with versions we're dealing with :) )
There was a problem hiding this comment.
Good catch! Just changed it back!
|
@samsalisbury do you think renaming |
Hi @alvin-huang, if other people are using this particular Dockerfile it would break their build, but I wouldn't be too concerned about it because this is a new(ish) file, and is geared really specifically towards producing release builds using CRT. See especially the |
|
Sounds good to me, thanks! @mladlow, tagged you as more of an FYI |
|
@mladlow this should be backported to any release lines you will be releasing with CRT |
|
@alvin-huang typically we'd ask the PR author to handle the backports. In the event of conflicts, they're the most familiar with how to resolve them. We shouldn't need any additional 1.7 releases, but would need backports to |
We pass in
PRODUCT_VERSIONin our docker build action so we need to reference it in our Dockerfile here to set the right version label.The concern is there may be folks using the current Dockerfile with tooling that sets
--build-arg VERSION=x.y.zand this will break them especially if they check the label for the current version like we do in the action. What do you think @samsalisbury ?