chore(releasing): Run hadolint on distributed Dockerfiles (vectordotd…

…ev#18224) * chore(releasing): Run hadolint on distributed Dockerfiles Signed-off-by: Jesse Szwedko <[email protected]> * spelling Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
aholmberg · Aug 11, 2023 · ad08d01 · ad08d01
1 parent ca7fa05
commit ad08d01
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -37,7 +37,6 @@ asdf
 asdfasdf
 assertverify
 Asterix
-asynk
 atag
 atx
 aty
@@ -460,6 +459,7 @@ gty
 Guangzhou
 guenter
 gzip'ed
+hadolint
 halfsies
 hannes
 Hashbang
@@ -569,7 +569,6 @@ kernelmode
 keybase
 keyclock
 keyid
-keypair
 keyxxxxx
 khvzak
 kib

diff --git a/distribution/docker/alpine/Dockerfile b/distribution/docker/alpine/Dockerfile
@@ -8,6 +8,8 @@ RUN tar -xvf vector-0*-"$(cat /etc/apk/arch)"-unknown-linux-musl*.tar.gz --strip
 RUN mkdir -p /var/lib/vector
 
 FROM docker.io/alpine:3.18
+# we want the latest versions of these
+# hadolint ignore=DL3018
 RUN apk --no-cache add ca-certificates tzdata
 
 COPY --from=builder /vector/bin/* /usr/local/bin/

diff --git a/distribution/docker/debian/Dockerfile b/distribution/docker/debian/Dockerfile
@@ -9,6 +9,8 @@ RUN mkdir -p /var/lib/vector
 
 FROM docker.io/debian:bookworm-slim
 
+# we want the latest versions of these
+# hadolint ignore=DL3008
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates tzdata systemd && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/bin/vector /usr/bin/vector

diff --git a/distribution/docker/distroless-libc/Dockerfile b/distribution/docker/distroless-libc/Dockerfile
@@ -7,7 +7,9 @@ RUN dpkg -i vector_*_"$(dpkg --print-architecture)".deb
 
 RUN mkdir -p /var/lib/vector
 
-FROM gcr.io/distroless/cc-debian11
+# distroless doesn't use static tags
+# hadolint ignore=DL3007
+FROM gcr.io/distroless/cc-debian11:latest
 
 COPY --from=builder /usr/bin/vector /usr/bin/vector
 COPY --from=builder /usr/share/doc/vector /usr/share/doc/vector

diff --git a/distribution/docker/distroless-static/Dockerfile b/distribution/docker/distroless-static/Dockerfile
@@ -7,7 +7,9 @@ RUN tar -xvf vector-0*-"$(cat /etc/apk/arch)"-unknown-linux-musl*.tar.gz --strip
 
 RUN mkdir -p /var/lib/vector
 
-FROM gcr.io/distroless/static
+# distroless doesn't use static tags
+# hadolint ignore=DL3007
+FROM gcr.io/distroless/static:latest
 
 COPY --from=builder /vector/bin/* /usr/local/bin/
 COPY --from=builder /vector/config/vector.toml /etc/vector/vector.toml