docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-11-04 18:13:42 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1650 from crazy-max/dirty-optin

Browse Source 
build: makes git dirty check opt-in
This commit is contained in:
Tõnis Tiigi
2023-02-28 10:49:17 -08:00
committed by GitHub
parent f2ac30f431 0645acfd79
commit 5e685c0e04
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/git.go
View File

@@ -67,7 +67,13 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st
if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) { if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) {
return res, errors.Wrapf(err, "buildx: failed to get git commit") return res, errors.Wrapf(err, "buildx: failed to get git commit")
} else if sha != "" { } else if sha != "" {
if gitc.IsDirty() { checkDirty := false
if v, ok := os.LookupEnv("BUILDX_GIT_CHECK_DIRTY"); ok {
if v, err := strconv.ParseBool(v); err == nil {
checkDirty = v
}
}
if checkDirty && gitc.IsDirty() {
sha += "-dirty" sha += "-dirty"
} }
if setGitLabels { if setGitLabels {

1
build/git_test.go
View File

@@ -131,6 +131,7 @@ func TestGetGitAttributes(t *testing.T) {
func TestGetGitAttributesDirty(t *testing.T) { func TestGetGitAttributesDirty(t *testing.T) {
setupTest(t) setupTest(t)
t.Setenv("BUILDX_GIT_CHECK_DIRTY", "true")
// make a change to test dirty flag // make a change to test dirty flag
df := []byte("FROM alpine:edge\n") df := []byte("FROM alpine:edge\n")