Skip to content

Commit 5ae64f0

Browse files
fix(build, image-spec): remove werf envs that persist after build
Signed-off-by: Aleksei Igrychev <aleksei.igrychev@palark.com>
1 parent be8441f commit 5ae64f0

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

pkg/build/stage/image_spec.go

+12
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,12 @@ func (s *ImageSpecStage) PrepareImage(ctx context.Context, _ Conveyor, _ contain
113113
return nil
114114
}
115115

116+
const imageSpecStageCacheVersion = "1"
117+
116118
func (s *ImageSpecStage) GetDependencies(_ context.Context, _ Conveyor, _ container_backend.ContainerBackend, _, _ *StageImage, _ container_backend.BuildContextArchiver) (string, error) {
117119
var args []string
118120

121+
args = append(args, imageSpecStageCacheVersion)
119122
args = append(args, s.imageSpec.Author)
120123
args = append(args, fmt.Sprint(s.imageSpec.ClearHistory))
121124

@@ -207,6 +210,15 @@ func modifyEnv(env, removeKeys []string, addKeysMap map[string]string) ([]string
207210
delete(baseEnvMap, key)
208211
}
209212

213+
// FIXME: This is a temporary solution to remove werf labels that persist after build.
214+
for _, key := range []string{
215+
"WERF_COMMIT_HASH",
216+
"WERF_COMMIT_TIME_HUMAN",
217+
"WERF_COMMIT_TIME_UNIX",
218+
} {
219+
delete(baseEnvMap, key)
220+
}
221+
210222
envMapToExpand := make(map[string]string)
211223
for key, value := range baseEnvMap {
212224
envMapToExpand[key] = value

0 commit comments

Comments
 (0)