dockerimg: restore sketch_context docker label
The sketch_context label was removed in commit 2a5bd6d (switch to debian base image)
but the code that reads this label in findOrBuildDockerImage was left intact.
This was causing Docker to always rebuild images since the label it was checking
for no longer existed in the Dockerfile template.
Restore the label and updates the template.Execute call to pass the required
InitFilesHash parameter.
Updates #43
diff --git a/dockerimg/createdockerfile.go b/dockerimg/createdockerfile.go
index d0ba6c3..e0307c1 100644
--- a/dockerimg/createdockerfile.go
+++ b/dockerimg/createdockerfile.go
@@ -68,6 +68,7 @@
RUN git config --global user.email "$GIT_USER_EMAIL" && \
git config --global user.name "$GIT_USER_NAME"
+LABEL sketch_context="{{.InitFilesHash}}"
COPY . /app
WORKDIR /app{{.SubDir}}
@@ -258,8 +259,9 @@
}
buf := new(bytes.Buffer)
err = template.Must(template.New("dockerfile").Parse(tmpl)).Execute(buf, map[string]string{
- "ExtraCmds": dockerfileExtraCmds,
- "SubDir": subPathWorkingDir,
+ "ExtraCmds": dockerfileExtraCmds,
+ "SubDir": subPathWorkingDir,
+ "InitFilesHash": hashInitFiles(initFiles),
})
if err != nil {
return "", fmt.Errorf("dockerfile template failed: %w", err)