From 7e4be4a7418e2df4a416c7001f0742b02af231f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Mon, 2 Oct 2023 09:15:11 +0200 Subject: [PATCH] Bump Alpine to 3.18.4 (#3391) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- cmd/ah/Dockerfile | 2 +- cmd/hub/Dockerfile | 2 +- cmd/scanner/Dockerfile | 4 ++-- database/migrations/Dockerfile | 2 +- database/tests/Dockerfile-db-tests | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/ah/Dockerfile b/cmd/ah/Dockerfile index 0bc1204fe..b2a2dbd91 100644 --- a/cmd/ah/Dockerfile +++ b/cmd/ah/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /go/src/github.com/artifacthub/ah/cmd/ah RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X main.version=$VERSION -X main.gitCommit=$GIT_COMMIT" -o /ah . # Final stage -FROM alpine:3.18.3 +FROM alpine:3.18.4 RUN apk --no-cache add git && addgroup -S ah -g 1000 && adduser -S ah -u 1000 -G ah USER 1000 COPY --from=ah-builder /ah /usr/local/bin diff --git a/cmd/hub/Dockerfile b/cmd/hub/Dockerfile index 0a52f9426..b8775b1ab 100644 --- a/cmd/hub/Dockerfile +++ b/cmd/hub/Dockerfile @@ -34,7 +34,7 @@ WORKDIR /docs/www RUN hugo # Final stage -FROM alpine:3.18.3 +FROM alpine:3.18.4 RUN apk --no-cache add ca-certificates && addgroup -S hub -g 1000 && adduser -S hub -u 1000 -G hub USER 1000 WORKDIR /home/hub diff --git a/cmd/scanner/Dockerfile b/cmd/scanner/Dockerfile index 9d11bbd27..5995d7b7f 100644 --- a/cmd/scanner/Dockerfile +++ b/cmd/scanner/Dockerfile @@ -8,12 +8,12 @@ WORKDIR /go/src/github.com/artifacthub/scanner/cmd/scanner RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /scanner . # Trivy installer -FROM alpine:3.18.3 AS trivy-installer +FROM alpine:3.18.4 AS trivy-installer RUN apk --no-cache add curl RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.44.1 # Final stage -FROM alpine:3.18.3 +FROM alpine:3.18.4 RUN apk --no-cache add ca-certificates && addgroup -S scanner -g 1000 && adduser -S scanner -u 1000 -G scanner USER 1000 WORKDIR /home/scanner diff --git a/database/migrations/Dockerfile b/database/migrations/Dockerfile index 53e585c49..760bb5c8a 100644 --- a/database/migrations/Dockerfile +++ b/database/migrations/Dockerfile @@ -4,7 +4,7 @@ RUN apk --no-cache add git RUN go install github.com/jackc/tern@latest # Build final image -FROM alpine:3.18.3 +FROM alpine:3.18.4 RUN addgroup -S db-migrator -g 1000 && adduser -S db-migrator -u 1000 -G db-migrator USER 1000 WORKDIR /home/db-migrator diff --git a/database/tests/Dockerfile-db-tests b/database/tests/Dockerfile-db-tests index e914bba53..2fc7d6d32 100644 --- a/database/tests/Dockerfile-db-tests +++ b/database/tests/Dockerfile-db-tests @@ -4,7 +4,7 @@ RUN apk --no-cache add git RUN go get -u github.com/jackc/tern # Build final image -FROM alpine:3.18.3 +FROM alpine:3.18.4 RUN apk --no-cache add git perl-app-cpanminus postgresql-client RUN cpanm --no-wget TAP::Parser::SourceHandler::pgTAP RUN addgroup -S db-tests && adduser -S db-tests -G db-tests