diff --git a/contrib/alertmanager-arm64/v0.15.0/Dockerfile b/contrib/alertmanager-arm64/v0.15.0/Dockerfile index 843ce2f1..9d34021e 100644 --- a/contrib/alertmanager-arm64/v0.15.0/Dockerfile +++ b/contrib/alertmanager-arm64/v0.15.0/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 WORKDIR /root RUN apk add --update libarchive-tools ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-arm64.tar.gz /root/ @@ -14,4 +14,4 @@ WORKDIR /alertmanager ENTRYPOINT [ "/bin/alertmanager" ] CMD [ "--config.file=/etc/alertmanager/alertmanager.yml", \ - "--storage.path=/alertmanager" ] + "--storage.path=/alertmanager" ] diff --git a/contrib/alertmanager-armhf/0.15.0/Dockerfile b/contrib/alertmanager-armhf/0.15.0/Dockerfile index d5631eb6..6fe8f89e 100644 --- a/contrib/alertmanager-armhf/0.15.0/Dockerfile +++ b/contrib/alertmanager-armhf/0.15.0/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 WORKDIR /root RUN apk add --update libarchive-tools ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-armv7.tar.gz /root/ @@ -14,4 +14,4 @@ WORKDIR /alertmanager ENTRYPOINT [ "/bin/alertmanager" ] CMD [ "--config.file=/etc/alertmanager/alertmanager.yml", \ - "--storage.path=/alertmanager" ] + "--storage.path=/alertmanager" ] diff --git a/contrib/prometheus-arm64/2.3/Dockerfile b/contrib/prometheus-arm64/2.3/Dockerfile index 9eee0221..dd283287 100644 --- a/contrib/prometheus-arm64/2.3/Dockerfile +++ b/contrib/prometheus-arm64/2.3/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 WORKDIR /root/ RUN apk add --update libarchive-tools curl \ @@ -25,7 +25,7 @@ WORKDIR /prometheus ENTRYPOINT [ "/bin/prometheus" ] CMD [ "--config.file=/etc/prometheus/prometheus.yml", \ - "--storage.tsdb.path=/prometheus", \ - "--web.console.libraries=/usr/share/prometheus/console_libraries", \ - "--web.console.templates=/usr/share/prometheus/consoles" ] + "--storage.tsdb.path=/prometheus", \ + "--web.console.libraries=/usr/share/prometheus/console_libraries", \ + "--web.console.templates=/usr/share/prometheus/consoles" ] diff --git a/contrib/prometheus-armhf/2.2/Dockerfile b/contrib/prometheus-armhf/2.2/Dockerfile index e22c7b6d..f87fcade 100644 --- a/contrib/prometheus-armhf/2.2/Dockerfile +++ b/contrib/prometheus-armhf/2.2/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 WORKDIR /root/ RUN apk add --update libarchive-tools curl \ @@ -24,8 +24,8 @@ VOLUME [ "/prometheus" ] WORKDIR /prometheus ENTRYPOINT [ "/bin/prometheus" ] CMD [ "--config.file=/etc/prometheus/prometheus.yml", \ - "--storage.tsdb.path=/prometheus", \ - "--web.console.libraries=/usr/share/prometheus/console_libraries", \ - "--web.console.templates=/usr/share/prometheus/consoles" ] + "--storage.tsdb.path=/prometheus", \ + "--web.console.libraries=/usr/share/prometheus/console_libraries", \ + "--web.console.templates=/usr/share/prometheus/consoles" ] diff --git a/gateway/Dockerfile b/gateway/Dockerfile index ce390515..20100c52 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -4,8 +4,8 @@ ARG GIT_COMMIT_MESSAGE ARG VERSION='dev' RUN curl -sSfL https://github.com/alexellis/license-check/releases/download/0.2.2/license-check \ - > /usr/bin/license-check \ - && chmod +x /usr/bin/license-check + > /usr/bin/license-check \ + && chmod +x /usr/bin/license-check WORKDIR /go/src/github.com/openfaas/faas/gateway @@ -28,19 +28,19 @@ RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Project" "Open && test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))" \ && go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover \ && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \ - -X github.com/openfaas/faas/gateway/version.GitCommitSHA=${GIT_COMMIT_SHA}\ - -X \"github.com/openfaas/faas/gateway/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\ - -X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \ + -X github.com/openfaas/faas/gateway/version.GitCommitSHA=${GIT_COMMIT_SHA}\ + -X \"github.com/openfaas/faas/gateway/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\"\ + -X github.com/openfaas/faas/gateway/version.Version=${VERSION}" \ -a -installsuffix cgo -o gateway . -FROM alpine:3.7 +FROM alpine:3.8 LABEL org.label-schema.license="MIT" \ - org.label-schema.vcs-url="https://github.com/openfaas/faas" \ - org.label-schema.vcs-type="Git" \ - org.label-schema.name="openfaas/faas" \ - org.label-schema.vendor="openfaas" \ - org.label-schema.docker.schema-version="1.0" + org.label-schema.vcs-url="https://github.com/openfaas/faas" \ + org.label-schema.vcs-type="Git" \ + org.label-schema.name="openfaas/faas" \ + org.label-schema.vendor="openfaas" \ + org.label-schema.docker.schema-version="1.0" RUN addgroup -S app \ && adduser -S -g app app diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64 index 621a2cbf..0d5af1d6 100644 --- a/gateway/Dockerfile.arm64 +++ b/gateway/Dockerfile.arm64 @@ -20,7 +20,7 @@ COPY server.go . #RUN license-check -path ./ --verbose=false \ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . -FROM alpine:3.7 +FROM alpine:3.8 RUN addgroup -S app \ && adduser -S -g app app diff --git a/gateway/Dockerfile.armhf b/gateway/Dockerfile.armhf index e3e02344..09e8b92c 100644 --- a/gateway/Dockerfile.armhf +++ b/gateway/Dockerfile.armhf @@ -18,7 +18,7 @@ COPY server.go . RUN GOARM=7 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . -FROM alpine:3.7 +FROM alpine:3.8 WORKDIR /root/ EXPOSE 8080 diff --git a/guide/deployment_swarm_arm.md b/guide/deployment_swarm_arm.md index 87801632..55dceb03 100644 --- a/guide/deployment_swarm_arm.md +++ b/guide/deployment_swarm_arm.md @@ -142,7 +142,7 @@ $ faas-cli build -f callme.yml Building: alexellis/callme:armhf with node template. Please wait.. docker build -t alexellis/callme:armhf . Sending build context to Docker daemon 8.704kB - Step 1/16 : FROM alpine:3.7 + Step 1/16 : FROM alpine:3.8 ---> 16566b7ed19e ... diff --git a/sample-functions/AlpineFunction/Dockerfile.arm64 b/sample-functions/AlpineFunction/Dockerfile.arm64 index 3dc129d2..768b187d 100644 --- a/sample-functions/AlpineFunction/Dockerfile.arm64 +++ b/sample-functions/AlpineFunction/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --no-cache add curl \ && curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \ diff --git a/sample-functions/ApiKeyProtected-Secrets/Dockerfile b/sample-functions/ApiKeyProtected-Secrets/Dockerfile index e03ab68d..690c4085 100644 --- a/sample-functions/ApiKeyProtected-Secrets/Dockerfile +++ b/sample-functions/ApiKeyProtected-Secrets/Dockerfile @@ -14,7 +14,7 @@ COPY handler.go . RUN go install -FROM alpine:3.7 +FROM alpine:3.8 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/CHelloWorld/src/Dockerfile b/sample-functions/CHelloWorld/src/Dockerfile index 95ba46ee..159f4a72 100644 --- a/sample-functions/CHelloWorld/src/Dockerfile +++ b/sample-functions/CHelloWorld/src/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 as builder +FROM alpine:3.8 as builder RUN apk add --no-cache curl \ && curl -SL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ @@ -7,12 +7,12 @@ RUN apk add --no-cache curl \ WORKDIR /root/ RUN apk add --no-cache gcc \ - musl-dev + musl-dev COPY main.c . RUN gcc main.c -static -o /main \ - && chmod +x /main \ - && /main + && chmod +x /main \ + && /main FROM scratch diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index 212d2508..94409dea 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index 16474403..c7560a69 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index 5799893e..4e20682a 100644 --- a/sample-functions/DockerHubStats/Dockerfile +++ b/sample-functions/DockerHubStats/Dockerfile @@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats RUN make install -FROM alpine:3.7 +FROM alpine:3.8 # 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 655741f5..54cf58b3 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.7 +FROM alpine:3.8 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile index 14872278..e21b3984 100644 --- a/sample-functions/HostnameIntent/Dockerfile +++ b/sample-functions/HostnameIntent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile index ffb87205..55fdb64b 100644 --- a/sample-functions/MarkdownRender/Dockerfile +++ b/sample-functions/MarkdownRender/Dockerfile @@ -14,7 +14,7 @@ COPY vendor vendor RUN go install -FROM alpine:3.7 +FROM alpine:3.8 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index 282a9a89..fe7e8270 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --update add nodejs nodejs-npm diff --git a/sample-functions/NodeInfo/Dockerfile.arm64 b/sample-functions/NodeInfo/Dockerfile.arm64 index a19b935d..264a7471 100644 --- a/sample-functions/NodeInfo/Dockerfile.arm64 +++ b/sample-functions/NodeInfo/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --update add nodejs nodejs-npm diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf index 892f4530..ed8f4e39 100644 --- a/sample-functions/NodeInfo/Dockerfile.armhf +++ b/sample-functions/NodeInfo/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --no-cache add nodejs nodejs-npm RUN apk --no-cache add curl \ diff --git a/sample-functions/ResizeImageMagick/Dockerfile.armhf b/sample-functions/ResizeImageMagick/Dockerfile.armhf index 029d1c6a..6c4cb062 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile.armhf +++ b/sample-functions/ResizeImageMagick/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM arm32v6/alpine:3.7 +FROM arm32v6/alpine:3.8 RUN apk --no-cache add imagemagick diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index 81e680f6..fa01ca05 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -14,7 +14,7 @@ COPY handler.go . RUN go install -FROM alpine:3.7 +FROM alpine:3.8 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/figlet/Dockerfile.armhf b/sample-functions/figlet/Dockerfile.armhf index 163f53c3..0bef08f6 100644 --- a/sample-functions/figlet/Dockerfile.armhf +++ b/sample-functions/figlet/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --no-cache add curl \ && curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \ diff --git a/sample-functions/gif-maker/Dockerfile b/sample-functions/gif-maker/Dockerfile index 27886fea..16710095 100644 --- a/sample-functions/gif-maker/Dockerfile +++ b/sample-functions/gif-maker/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.7 +FROM alpine:3.8 RUN apk --no-cache add ffmpeg gifsicle curl \ - && curl -LS https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \ - && chmod +x /usr/bin/fwatchdog \ - && apk del curl + && curl -LS https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \ + && chmod +x /usr/bin/fwatchdog \ + && apk del curl WORKDIR /root/ COPY entry.sh . ENV fprocess="./entry.sh"