diff --git a/auth/basic-auth/Dockerfile b/auth/basic-auth/Dockerfile index 26556566..ba099ba2 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.13 as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14 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 8056b981..95660215 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -47,7 +47,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.13 as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14 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 eaee56cf..c65dbcec 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.13 +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14 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 20fb2d5a..e69bee85 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.13 as builder +FROM alpine:3.14 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 2af240e7..0126863b 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.13 +FROM alpine:3.14 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 a7f0519a..81afe0d3 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.13 +FROM alpine:3.14 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 c25b9035..a58fd679 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.13 +FROM alpine:3.14 # 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 9f276a27..0e3f5ebf 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.13 +FROM alpine:3.14 # 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 a71cf55b..60d2b6ba 100644 --- a/sample-functions/MarkdownRender/Dockerfile +++ b/sample-functions/MarkdownRender/Dockerfile @@ -13,7 +13,7 @@ COPY vendor vendor RUN go install -FROM alpine:3.13 +FROM alpine:3.14 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 6cbd1001..1641b8d6 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.13 +FROM alpine:3.14 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 afdaddc1..c4d78d70 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.13 +FROM arm32v6/alpine:3.14 RUN apk --no-cache add imagemagick diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index e2b9340a..91cb4b87 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -12,7 +12,7 @@ COPY handler.go . RUN go install -FROM alpine:3.13 +FROM alpine:3.14 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 f1f48e89..ed774800 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.13 +FROM alpine:3.14 RUN mkdir -p /home/app