Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(releasing): Run hadolint on distributed Dockerfiles #18224

Merged
merged 2 commits into from
Aug 11, 2023
Merged

chore(releasing): Run hadolint on distributed Dockerfiles #18224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f66ebd
chore(releasing): Run hadolint on distributed Dockerfiles
jszwedko Aug 11, 2023
c7756be
spelling
jszwedko Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ asdf
asdfasdf
assertverify
Asterix
asynk
atag
atx
aty
Expand Down Expand Up @@ -460,6 +459,7 @@ gty
Guangzhou
guenter
gzip'ed
hadolint
halfsies
hannes
Hashbang
Expand Down Expand Up @@ -569,7 +569,6 @@ kernelmode
keybase
keyclock
keyid
keypair
keyxxxxx
khvzak
kib
Expand Down
2 changes: 2 additions & 0 deletions distribution/docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 2 additions & 0 deletions distribution/docker/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion distribution/docker/distroless-libc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion distribution/docker/distroless-static/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down