From 77be2f34037cf80632a18420b903de18cb2a1171 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Sun, 31 Jan 2021 09:23:30 +0000 Subject: [PATCH] Update to latest Alpine base image Version alpine:3.13 is now available Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- auth/basic-auth/Dockerfile | 2 +- gateway/Dockerfile | 2 +- sample-functions/AlpineFunction/Dockerfile | 2 +- sample-functions/CHelloWorld/src/Dockerfile | 2 +- sample-functions/CaptainsIntent/Dockerfile | 2 +- sample-functions/ChangeColorIntent/Dockerfile | 2 +- sample-functions/DockerHubStats/Dockerfile | 2 +- sample-functions/DockerHubStats/Dockerfile.armhf | 2 +- sample-functions/MarkdownRender/Dockerfile | 2 +- sample-functions/Nmap/Dockerfile | 2 +- sample-functions/ResizeImageMagick/Dockerfile.armhf | 2 +- sample-functions/WebhookStash/Dockerfile | 2 +- sample-functions/hey/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/auth/basic-auth/Dockerfile b/auth/basic-auth/Dockerfile index 9e029306..26556566 100644 --- a/auth/basic-auth/Dockerfile +++ b/auth/basic-auth/Dockerfile @@ -26,7 +26,7 @@ RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test -v RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \ --ldflags "-s -w" -a -installsuffix cgo -o handler . -FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12 as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.13 as ship # Add non-root user RUN addgroup -S app && adduser -S -g app app \ && mkdir -p /home/app \ diff --git a/gateway/Dockerfile b/gateway/Dockerfile index 15c3a0ef..94be0c4e 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -48,7 +48,7 @@ RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -- -X github.com/openfaas/faas/gateway/types.Arch=${TARGETARCH}" \ -a -installsuffix cgo -o gateway . -FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12 as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.13 as ship LABEL org.label-schema.license="MIT" \ org.label-schema.vcs-url="https://github.com/openfaas/faas" \ diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile index 234d1601..eaee56cf 100644 --- a/sample-functions/AlpineFunction/Dockerfile +++ b/sample-functions/AlpineFunction/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12 +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.13 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/CHelloWorld/src/Dockerfile b/sample-functions/CHelloWorld/src/Dockerfile index 2d2d5dfb..20fb2d5a 100644 --- a/sample-functions/CHelloWorld/src/Dockerfile +++ b/sample-functions/CHelloWorld/src/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.18.8 as watchdog -FROM alpine:3.11 as builder +FROM alpine:3.13 as builder COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index ba7d7781..2af240e7 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.18.8 as watchdog -FROM alpine:3.11 +FROM alpine:3.13 RUN apk --update add nodejs nodejs-npm COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index 445c3e78..a7f0519a 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.18.8 as watchdog -FROM alpine:3.11 +FROM alpine:3.13 RUN apk --update add nodejs nodejs-npm COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index e0caa8b9..c25b9035 100644 --- a/sample-functions/DockerHubStats/Dockerfile +++ b/sample-functions/DockerHubStats/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats RUN set -ex && apk add make && make install -FROM alpine:3.11 +FROM alpine:3.13 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/DockerHubStats/Dockerfile.armhf b/sample-functions/DockerHubStats/Dockerfile.armhf index 26f56ed1..9f276a27 100644 --- a/sample-functions/DockerHubStats/Dockerfile.armhf +++ b/sample-functions/DockerHubStats/Dockerfile.armhf @@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats RUN make install -FROM alpine:3.11 +FROM alpine:3.13 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile index d516fb46..a71cf55b 100644 --- a/sample-functions/MarkdownRender/Dockerfile +++ b/sample-functions/MarkdownRender/Dockerfile @@ -13,7 +13,7 @@ COPY vendor vendor RUN go install -FROM alpine:3.11 +FROM alpine:3.13 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/Nmap/Dockerfile b/sample-functions/Nmap/Dockerfile index 2aedb393..6cbd1001 100644 --- a/sample-functions/Nmap/Dockerfile +++ b/sample-functions/Nmap/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.18.8 as watchdog -FROM alpine:3.11 +FROM alpine:3.13 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/ResizeImageMagick/Dockerfile.armhf b/sample-functions/ResizeImageMagick/Dockerfile.armhf index 0cdac0c5..afdaddc1 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile.armhf +++ b/sample-functions/ResizeImageMagick/Dockerfile.armhf @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.18.8 as watchdog -FROM arm32v6/alpine:3.11 +FROM arm32v6/alpine:3.13 RUN apk --no-cache add imagemagick diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index 136705cc..e2b9340a 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -12,7 +12,7 @@ COPY handler.go . RUN go install -FROM alpine:3.11 +FROM alpine:3.13 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/hey/Dockerfile b/sample-functions/hey/Dockerfile index 8988c0c8..f1f48e89 100644 --- a/sample-functions/hey/Dockerfile +++ b/sample-functions/hey/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.18.1 as watchdog -FROM alpine:3.11 +FROM alpine:3.13 RUN mkdir -p /home/app