beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bakefile: Remove default value of DOCKER_GITCOMMIT

Browse source 
"HEAD" will still be used as a version if no DOCKER_COMMIT is provided
(for example when not running via `make`), but it won't prevent it being
set to the GITHUB_SHA variable when it's present.

This should fix `Git commit` reported by `docker version` for the
binaries generated by `moby-bin`.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski 2023-07-31 18:32:01 +02:00
parent 7baab8bd6c
commit d7a9f15775
No known key found for this signature in database
GPG key ID: B85EFCFE26DEF92A
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-bake.hcl
View file

@ -14,7 +14,7 @@ variable "DOCKER_BUILDTAGS" {
default = "" default = ""
} }
variable "DOCKER_GITCOMMIT" { variable "DOCKER_GITCOMMIT" {
default = "HEAD" default = null
} }
# Docker version such as 23.0.0-dev. Automatically generated through Git ref. # Docker version such as 23.0.0-dev. Automatically generated through Git ref.
@ -81,7 +81,7 @@ target "_common" {
DOCKER_STATIC = DOCKER_STATIC DOCKER_STATIC = DOCKER_STATIC
DOCKER_LDFLAGS = DOCKER_LDFLAGS DOCKER_LDFLAGS = DOCKER_LDFLAGS
DOCKER_BUILDTAGS = DOCKER_BUILDTAGS DOCKER_BUILDTAGS = DOCKER_BUILDTAGS
DOCKER_GITCOMMIT = DOCKER_GITCOMMIT != "" ? DOCKER_GITCOMMIT : GITHUB_SHA DOCKER_GITCOMMIT = DOCKER_GITCOMMIT != null ? DOCKER_GITCOMMIT : GITHUB_SHA
VERSION = VERSION != "" ? VERSION : GITHUB_REF VERSION = VERSION != "" ? VERSION : GITHUB_REF
PLATFORM = PLATFORM PLATFORM = PLATFORM
PRODUCT = PRODUCT PRODUCT = PRODUCT