Skip to content
Permalink
Browse files

Bump alpine to 3.11

There's a new release which appears to have no apparent down-
sides or breakages.

https://www.alpinelinux.org/posts/Alpine-3.11.2-released.html

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
alexellis committed Dec 27, 2019
1 parent 76e463a commit b45e2a52a4eb5323c842c7914b52a1cd1b3e16ea
Showing with 77 additions and 40 deletions.
  1. +1 −1 auth/basic-auth/Dockerfile
  2. +1 −1 auth/basic-auth/Dockerfile.arm64
  3. +1 −1 gateway/Dockerfile
  4. +1 −1 gateway/Dockerfile.arm64
  5. +1 −1 gateway/Dockerfile.armhf
  6. +2 −2 sample-functions/AlpineFunction/Dockerfile
  7. +2 −2 sample-functions/AlpineFunction/Dockerfile.arm64
  8. +2 −2 sample-functions/AlpineFunction/Dockerfile.armhf
  9. +1 −1 sample-functions/BaseFunctions/R/Dockerfile
  10. +1 −1 sample-functions/BaseFunctions/coffee/Dockerfile
  11. +1 −1 sample-functions/BaseFunctions/dncore/Dockerfile
  12. +1 −1 sample-functions/BaseFunctions/golang/Dockerfile
  13. +1 −1 sample-functions/BaseFunctions/java/Dockerfile
  14. +1 −1 sample-functions/BaseFunctions/node/Dockerfile
  15. +1 −1 sample-functions/BaseFunctions/python/Dockerfile
  16. +2 −2 sample-functions/CHelloWorld/src/Dockerfile
  17. +2 −2 sample-functions/CaptainsIntent/Dockerfile
  18. +2 −2 sample-functions/ChangeColorIntent/Dockerfile
  19. +2 −2 sample-functions/DockerHubStats/Dockerfile
  20. +1 −1 sample-functions/DockerHubStats/Dockerfile.armhf
  21. +6 −0 sample-functions/HostnameIntent/Dockerfile
  22. +2 −2 sample-functions/MarkdownRender/Dockerfile
  23. +2 −2 sample-functions/Nmap/Dockerfile
  24. +3 −0 sample-functions/NodeInfo/Dockerfile
  25. +4 −0 sample-functions/NodeInfo/Dockerfile.arm64
  26. +4 −0 sample-functions/NodeInfo/Dockerfile.armhf
  27. +1 −1 sample-functions/Phantomjs/Dockerfile
  28. +1 −1 sample-functions/ResizeImageMagick/Dockerfile
  29. +2 −2 sample-functions/ResizeImageMagick/Dockerfile.armhf
  30. +1 −1 sample-functions/SentimentAnalysis/Dockerfile
  31. +1 −1 sample-functions/SentimentAnalysis/Dockerfile.armhf
  32. +2 −2 sample-functions/WebhookStash/Dockerfile
  33. +5 −0 sample-functions/WordCountFunction/Dockerfile
  34. +1 −0 sample-functions/echo/Dockerfile
  35. +3 −0 sample-functions/figlet/Dockerfile
  36. +2 −0 sample-functions/figlet/Dockerfile.armhf
  37. +5 −0 sample-functions/gif-maker/Dockerfile
  38. +5 −1 sample-functions/pwgen/Dockerfile
@@ -16,7 +16,7 @@ RUN license-check -path ./ --verbose=false "OpenFaaS Authors" "OpenFaaS Author(s
go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
go test $(go list ./... | grep -v /vendor/) -cover

FROM alpine:3.10 as ship
FROM alpine:3.11 as ship
# Add non-root user
RUN addgroup -S app && adduser -S -g app app \
&& mkdir -p /home/app \
@@ -14,7 +14,7 @@ RUN license-check -path ./ --verbose=false "OpenFaaS Authors" "OpenFaaS Author(s
&& go test $(go list ./... | grep -v /vendor/) -cover && \
CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w" -a -installsuffix cgo -o handler .

FROM alpine:3.10
FROM alpine:3.11
# Add non-root user
RUN addgroup -S app && adduser -S -g app app \
&& mkdir -p /home/app \
@@ -40,7 +40,7 @@ RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Authors" "Open
-X github.com/openfaas/faas/gateway/types.Arch=${ARCH}"\
-a -installsuffix cgo -o gateway .

FROM alpine:3.10
FROM alpine:3.11

ARG ARCH="x86_64"

@@ -33,7 +33,7 @@ RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Project" "Open
-X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \
-a -installsuffix cgo -o gateway .

FROM alpine:3.10
FROM alpine:3.11

LABEL org.label-schema.license="MIT" \
org.label-schema.vcs-url="https://github.com/openfaas/faas" \
@@ -33,7 +33,7 @@ RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Project" "Open
-X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \
-a -installsuffix cgo -o gateway .

FROM alpine:3.10
FROM alpine:3.11

LABEL org.label-schema.license="MIT" \
org.label-schema.vcs-url="https://github.com/openfaas/faas" \
@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10
FROM alpine:3.11

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10
FROM alpine:3.11

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10
FROM alpine:3.11

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM artemklevtsov/r-alpine:latest

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM node:6.9.1-alpine

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as build

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM golang:1.11-alpine
ENV CGO_ENABLED=0
@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM openjdk:8u121-jdk-alpine

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM node:6.9.1-alpine

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM python:2.7-alpine

@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10 as builder
FROM alpine:3.11 as builder
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog

@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10
FROM alpine:3.11
RUN apk --update add nodejs nodejs-npm

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10
FROM alpine:3.11
RUN apk --update add nodejs nodejs-npm

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM golang:1.11-alpine as builder
ENV CGO_ENABLED=0
@@ -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.10
FROM alpine:3.11

# Needed to reach the hub
RUN apk --no-cache add ca-certificates
@@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats

RUN make install

FROM alpine:3.10
FROM alpine:3.11

# Needed to reach the hub
RUN apk --no-cache add ca-certificates
@@ -1,10 +1,16 @@
FROM functions/alpine:latest

USER root

RUN apk --update add nodejs nodejs-npm

COPY package.json .
COPY handler.js .
COPY sample.json .

RUN npm i

USER 1000

ENV fprocess="node handler.js"
CMD ["fwatchdog"]
@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM golang:1.11-alpine as builder
ENV CGO_ENABLED=0
@@ -13,7 +13,7 @@ COPY vendor vendor

RUN go install

FROM alpine:3.10
FROM alpine:3.11

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alpine:3.10
FROM alpine:3.11

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
@@ -1,11 +1,14 @@
FROM functions/alpine:latest

USER root

RUN apk --update add nodejs nodejs-npm

COPY package.json .
COPY main.js .

RUN npm i
USER 1000

ENV fprocess="node main.js"
CMD ["fwatchdog"]
@@ -1,11 +1,15 @@
FROM functions/alpine:latest

USER root

RUN apk --update add nodejs nodejs-npm

COPY package.json .
COPY main.js .

RUN npm i

USER 1000

ENV fprocess="node main.js"
CMD ["fwatchdog"]
@@ -1,11 +1,15 @@
FROM functions/alpine:latest

USER root

RUN apk --update add nodejs nodejs-npm

COPY package.json .
COPY main.js .

RUN npm i

USER 1000

ENV fprocess="node main.js"
CMD ["fwatchdog"]
@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM alexellis2/phantomjs-docker:latest

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM v4tech/imagemagick

@@ -1,6 +1,6 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM arm32v6/alpine:3.10
FROM arm32v6/alpine:3.11

RUN apk --no-cache add imagemagick

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM python:2.7-alpine

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM arm32v7/python:2.7-slim

@@ -1,4 +1,4 @@
FROM openfaas/classic-watchdog:0.14.4 as watchdog
FROM openfaas/classic-watchdog:0.18.8 as watchdog

FROM golang:1.11-alpine as builder
ENV CGO_ENABLED=0
@@ -12,7 +12,7 @@ COPY handler.go .

RUN go install

FROM alpine:3.10
FROM alpine:3.11

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
@@ -1,5 +1,10 @@
FROM functions/alpine:latest

USER root

# Populate example here
ENV fprocess="wc"

USER 1000

CMD ["fwatchdog"]
@@ -1,2 +1,3 @@
FROM functions/alpine:latest

ENV fprocess "/bin/cat"
@@ -1,8 +1,11 @@
FROM functions/alpine:latest

USER root

RUN apk add --no-cache figlet

ENV fprocess="figlet"
USER 1000

HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
CMD ["fwatchdog"]
@@ -1,7 +1,9 @@
FROM functions/alpine:latest
USER root

RUN apk add --no-cache figlet

USER 1000
ENV fprocess="figlet"

HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
@@ -1,7 +1,12 @@
FROM functions/alpine:latest

USER root

RUN apk add ffmpeg gifsicle
WORKDIR /root/
COPY entry.sh .
ENV fprocess="./entry.sh"

USER 1000

CMD ["fwatchdog"]
@@ -1,5 +1,9 @@
FROM functions/alpine:latest


USER root

RUN apk add --no-cache pwgen

USER 1000

ENV fprocess="xargs pwgen -s"

0 comments on commit b45e2a5

Please sign in to comment.
You can’t perform that action at this time.