mirror of
https://github.com/openfaas/faas.git
synced 2025-06-09 08:46:48 +00:00
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>
This commit is contained in:
parent
76e463a7a0
commit
b45e2a52a4
@ -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 build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
|
||||||
go test $(go list ./... | grep -v /vendor/) -cover
|
go test $(go list ./... | grep -v /vendor/) -cover
|
||||||
|
|
||||||
FROM alpine:3.10 as ship
|
FROM alpine:3.11 as ship
|
||||||
# Add non-root user
|
# Add non-root user
|
||||||
RUN addgroup -S app && adduser -S -g app app \
|
RUN addgroup -S app && adduser -S -g app app \
|
||||||
&& mkdir -p /home/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 && \
|
&& go test $(go list ./... | grep -v /vendor/) -cover && \
|
||||||
CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
|
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
|
# Add non-root user
|
||||||
RUN addgroup -S app && adduser -S -g app app \
|
RUN addgroup -S app && adduser -S -g app app \
|
||||||
&& mkdir -p /home/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}"\
|
-X github.com/openfaas/faas/gateway/types.Arch=${ARCH}"\
|
||||||
-a -installsuffix cgo -o gateway .
|
-a -installsuffix cgo -o gateway .
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
ARG ARCH="x86_64"
|
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}" \
|
-X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \
|
||||||
-a -installsuffix cgo -o gateway .
|
-a -installsuffix cgo -o gateway .
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.label-schema.license="MIT" \
|
LABEL org.label-schema.license="MIT" \
|
||||||
org.label-schema.vcs-url="https://github.com/openfaas/faas" \
|
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}" \
|
-X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \
|
||||||
-a -installsuffix cgo -o gateway .
|
-a -installsuffix cgo -o gateway .
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
LABEL org.label-schema.license="MIT" \
|
LABEL org.label-schema.license="MIT" \
|
||||||
org.label-schema.vcs-url="https://github.com/openfaas/faas" \
|
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
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /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
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /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
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /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
|
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
|
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
|
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
|
FROM golang:1.11-alpine
|
||||||
ENV CGO_ENABLED=0
|
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
|
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
|
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
|
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
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /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
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
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
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
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
|
FROM golang:1.11-alpine as builder
|
||||||
ENV CGO_ENABLED=0
|
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
|
COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
|
||||||
RUN set -ex && apk add make && make install
|
RUN set -ex && apk add make && make install
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
# Needed to reach the hub
|
# Needed to reach the hub
|
||||||
RUN apk --no-cache add ca-certificates
|
RUN apk --no-cache add ca-certificates
|
||||||
|
@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
|
|||||||
|
|
||||||
RUN make install
|
RUN make install
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
# Needed to reach the hub
|
# Needed to reach the hub
|
||||||
RUN apk --no-cache add ca-certificates
|
RUN apk --no-cache add ca-certificates
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
@ -6,5 +9,8 @@ COPY handler.js .
|
|||||||
COPY sample.json .
|
COPY sample.json .
|
||||||
|
|
||||||
RUN npm i
|
RUN npm i
|
||||||
|
|
||||||
|
USER 1000
|
||||||
|
|
||||||
ENV fprocess="node handler.js"
|
ENV fprocess="node handler.js"
|
||||||
CMD ["fwatchdog"]
|
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
|
FROM golang:1.11-alpine as builder
|
||||||
ENV CGO_ENABLED=0
|
ENV CGO_ENABLED=0
|
||||||
@ -13,7 +13,7 @@ COPY vendor vendor
|
|||||||
|
|
||||||
RUN go install
|
RUN go install
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /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
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /usr/bin/fwatchdog
|
RUN chmod +x /usr/bin/fwatchdog
|
||||||
|
@ -1,11 +1,14 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
COPY main.js .
|
COPY main.js .
|
||||||
|
|
||||||
RUN npm i
|
RUN npm i
|
||||||
|
USER 1000
|
||||||
|
|
||||||
ENV fprocess="node main.js"
|
ENV fprocess="node main.js"
|
||||||
CMD ["fwatchdog"]
|
CMD ["fwatchdog"]
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
@ -7,5 +9,7 @@ COPY main.js .
|
|||||||
|
|
||||||
RUN npm i
|
RUN npm i
|
||||||
|
|
||||||
|
USER 1000
|
||||||
|
|
||||||
ENV fprocess="node main.js"
|
ENV fprocess="node main.js"
|
||||||
CMD ["fwatchdog"]
|
CMD ["fwatchdog"]
|
@ -1,5 +1,7 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
@ -7,5 +9,7 @@ COPY main.js .
|
|||||||
|
|
||||||
RUN npm i
|
RUN npm i
|
||||||
|
|
||||||
|
USER 1000
|
||||||
|
|
||||||
ENV fprocess="node main.js"
|
ENV fprocess="node main.js"
|
||||||
CMD ["fwatchdog"]
|
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
|
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
|
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
|
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
|
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
|
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
|
FROM golang:1.11-alpine as builder
|
||||||
ENV CGO_ENABLED=0
|
ENV CGO_ENABLED=0
|
||||||
@ -12,7 +12,7 @@ COPY handler.go .
|
|||||||
|
|
||||||
RUN go install
|
RUN go install
|
||||||
|
|
||||||
FROM alpine:3.10
|
FROM alpine:3.11
|
||||||
|
|
||||||
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
|
||||||
RUN chmod +x /usr/bin/fwatchdog
|
RUN chmod +x /usr/bin/fwatchdog
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
# Populate example here
|
# Populate example here
|
||||||
ENV fprocess="wc"
|
ENV fprocess="wc"
|
||||||
|
|
||||||
|
USER 1000
|
||||||
|
|
||||||
CMD ["fwatchdog"]
|
CMD ["fwatchdog"]
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
ENV fprocess "/bin/cat"
|
ENV fprocess "/bin/cat"
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk add --no-cache figlet
|
RUN apk add --no-cache figlet
|
||||||
|
|
||||||
ENV fprocess="figlet"
|
ENV fprocess="figlet"
|
||||||
|
USER 1000
|
||||||
|
|
||||||
HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
|
HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
|
||||||
CMD ["fwatchdog"]
|
CMD ["fwatchdog"]
|
@ -1,7 +1,9 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk add --no-cache figlet
|
RUN apk add --no-cache figlet
|
||||||
|
|
||||||
|
USER 1000
|
||||||
ENV fprocess="figlet"
|
ENV fprocess="figlet"
|
||||||
|
|
||||||
HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
|
HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk add ffmpeg gifsicle
|
RUN apk add ffmpeg gifsicle
|
||||||
WORKDIR /root/
|
WORKDIR /root/
|
||||||
COPY entry.sh .
|
COPY entry.sh .
|
||||||
ENV fprocess="./entry.sh"
|
ENV fprocess="./entry.sh"
|
||||||
|
|
||||||
|
USER 1000
|
||||||
|
|
||||||
CMD ["fwatchdog"]
|
CMD ["fwatchdog"]
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
FROM functions/alpine:latest
|
FROM functions/alpine:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
RUN apk add --no-cache pwgen
|
RUN apk add --no-cache pwgen
|
||||||
|
|
||||||
|
USER 1000
|
||||||
|
|
||||||
ENV fprocess="xargs pwgen -s"
|
ENV fprocess="xargs pwgen -s"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user