Skip to content

Commit 836fe2b

Browse files
authored
Merge pull request moby#5248 from tonistiigi/dockerfile-validate
ci: enable validating all Dockerfiles
2 parents 8a58645 + b8f3379 commit 836fe2b

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ exec dlv exec /usr/bin/buildkitd \\
354354
--continue \\
355355
-- "\$@"
356356
EOF
357-
ENV DELVE_PORT 5000
357+
ENV DELVE_PORT=5000
358358
ENTRYPOINT ["/docker-entrypoint.sh"]
359359

360360
FROM binaries AS buildkit-darwin

docker-bake.hcl

+23-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ target "integration-tests" {
126126
}
127127

128128
group "validate" {
129-
targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-archutil", "validate-shfmt", "validate-docs", "validate-docs-dockerfile"]
129+
targets = ["lint", "validate-vendor", "validate-doctoc", "validate-dockerfile", "validate-generated-files", "validate-archutil", "validate-shfmt", "validate-docs", "validate-docs-dockerfile"]
130130
}
131131

132132
target "lint" {
@@ -218,6 +218,28 @@ target "validate-docs-dockerfile" {
218218
output = ["type=cacheonly"]
219219
}
220220

221+
target "validate-dockerfile" {
222+
matrix = {
223+
dockerfile = [
224+
"Dockerfile",
225+
"./hack/dockerfiles/archutil.Dockerfile",
226+
"./hack/dockerfiles/authors.Dockerfile",
227+
"./hack/dockerfiles/docs-dockerfile.Dockerfile",
228+
"./hack/dockerfiles/docs.Dockerfile",
229+
"./hack/dockerfiles/doctoc.Dockerfile",
230+
"./hack/dockerfiles/generated-files.Dockerfile",
231+
"./hack/dockerfiles/govulncheck.Dockerfile",
232+
"./hack/dockerfiles/lint.Dockerfile",
233+
"./hack/dockerfiles/shfmt.Dockerfile",
234+
"./hack/dockerfiles/vendor.Dockerfile",
235+
"./frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile",
236+
]
237+
}
238+
name = "validate-dockerfile-${md5(dockerfile)}"
239+
dockerfile = dockerfile
240+
call = "check"
241+
}
242+
221243
target "vendor" {
222244
inherits = ["_common"]
223245
dockerfile = "./hack/dockerfiles/vendor.Dockerfile"

hack/dockerfiles/vendor.Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ RUN --mount=target=/context \
3838
fi
3939
EOT
4040

41-
FROM psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated
41+
FROM --platform=linux/amd64 psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated-amd64
42+
43+
FROM go-mod-outdated-amd64 AS go-mod-outdated
4244
FROM base AS outdated
4345
RUN --mount=target=.,rw \
4446
--mount=target=/go/pkg/mod,type=cache \

0 commit comments

Comments
 (0)