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

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

Browse source 
[24.0 backport] Fix DOCKER_GITCOMMIT in moby-bin
This commit is contained in:
Sebastiaan van Stijn 2023-08-18 12:52:11 +02:00 committed by GitHub
commit 821e6d8b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/bin-image.yml vendored
View file

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

4
docker-bake.hcl
View file

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