Browse Source

Merge pull request #46260 from vvoland/ci-mobybin-sha-24

[24.0 backport] Fix DOCKER_GITCOMMIT in moby-bin
Sebastiaan van Stijn 1 year ago
parent
commit
821e6d8b42
2 changed files with 4 additions and 2 deletions
  1. 2 0
      .github/workflows/bin-image.yml
  2. 2 2
      docker-bake.hcl

+ 2 - 0
.github/workflows/bin-image.yml

@@ -113,6 +113,8 @@ jobs:
         name: Build
         id: bake
         uses: docker/bake-action@v3
+        env:
+          DOCKER_GITCOMMIT: ${{ github.sha }}
         with:
           files: |
             ./docker-bake.hcl

+ 2 - 2
docker-bake.hcl

@@ -14,7 +14,7 @@ variable "DOCKER_BUILDTAGS" {
   default = ""
 }
 variable "DOCKER_GITCOMMIT" {
-  default = "HEAD"
+  default = null
 }
 
 # Docker version such as 23.0.0-dev. Automatically generated through Git ref.
@@ -81,7 +81,7 @@ target "_common" {
     DOCKER_STATIC = DOCKER_STATIC
     DOCKER_LDFLAGS = DOCKER_LDFLAGS
     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
     PLATFORM = PLATFORM
     PRODUCT = PRODUCT