Sfoglia il codice sorgente

bakefile: Remove default value of DOCKER_GITCOMMIT

"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>
Paweł Gronowski 1 anno fa
parent
commit
d7a9f15775
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      docker-bake.hcl

+ 2 - 2
docker-bake.hcl

@@ -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