From 7f6295c9cff2f9f6584fd33327615e26851c31b2 Mon Sep 17 00:00:00 2001 From: "Ivana Yovcheva (VMware)" Date: Mon, 30 Apr 2018 15:31:20 +0300 Subject: [PATCH] Update alpine version to 3.7 This updates alpine version to 3.7 in sample-functions, gateway and some markdown docas. Signed-off-by: Ivana Yovcheva (VMware) --- gateway/Dockerfile | 2 +- gateway/Dockerfile.arm64 | 2 +- gateway/Dockerfile.armhf | 2 +- .../openfaas/nats-queue-worker/queue-worker/Dockerfile | 2 +- .../openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf | 2 +- guide/deployment_swarm_arm.md | 4 ++-- sample-functions/AlpineFunction/Dockerfile.arm64 | 2 +- sample-functions/ApiKeyProtected-Secrets/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/HostnameIntent/Dockerfile | 2 +- sample-functions/MarkdownRender/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile.arm64 | 2 +- sample-functions/NodeInfo/Dockerfile.armhf | 2 +- sample-functions/ResizeImageMagick/Dockerfile.armhf | 2 +- sample-functions/WebhookStash/Dockerfile | 2 +- sample-functions/figlet/Dockerfile | 2 +- sample-functions/figlet/Dockerfile.armhf | 2 +- sample-functions/gif-maker/Dockerfile | 2 +- watchdog/README.md | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gateway/Dockerfile b/gateway/Dockerfile index d97c6baf..3b8ac03a 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -25,7 +25,7 @@ RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Project" \ && go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover \ && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . -FROM alpine:3.6 +FROM alpine:3.7 RUN addgroup -S app \ && adduser -S -g app app diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64 index dd84a7a7..e920c1cb 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.6 +FROM alpine:3.7 RUN addgroup -S app \ && adduser -S -g app app diff --git a/gateway/Dockerfile.armhf b/gateway/Dockerfile.armhf index 9a545501..c79cd3d2 100644 --- a/gateway/Dockerfile.armhf +++ b/gateway/Dockerfile.armhf @@ -15,7 +15,7 @@ COPY server.go . RUN GOARM=7 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway . -FROM alpine:3.6 +FROM alpine:3.7 WORKDIR /root/ EXPOSE 8080 diff --git a/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile b/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile index 1258cf80..7213c68b 100644 --- a/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile +++ b/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile @@ -6,7 +6,7 @@ COPY main.go . RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app . -FROM alpine:3.6 +FROM alpine:3.7 RUN apk add --no-cache ca-certificates WORKDIR /root/ diff --git a/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf b/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf index 1258cf80..7213c68b 100644 --- a/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf +++ b/gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf @@ -6,7 +6,7 @@ COPY main.go . RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app . -FROM alpine:3.6 +FROM alpine:3.7 RUN apk add --no-cache ca-certificates WORKDIR /root/ diff --git a/guide/deployment_swarm_arm.md b/guide/deployment_swarm_arm.md index 731883a3..87801632 100644 --- a/guide/deployment_swarm_arm.md +++ b/guide/deployment_swarm_arm.md @@ -22,7 +22,7 @@ The function watchdog is cross-compiled through our CI process on a 64-bit PC. **Functions on armhf** -When running OpenFaaS on ARM a key consideration is that we need to use ARM base Docker images for our functions. This typically means swapping out the `FROM` instruction and the function code can stay the same, but more of the official base images are becoming multi-architecture (e.g. `apline:3.6`) which means that the build stage will pull the appropriate image for the hardware performing the build. +When running OpenFaaS on ARM a key consideration is that we need to use ARM base Docker images for our functions. This typically means swapping out the `FROM` instruction and the function code can stay the same, but more of the official base images are becoming multi-architecture (e.g. `apline:3.7`) which means that the build stage will pull the appropriate image for the hardware performing the build. ### Initialize Swarm Mode @@ -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.6 + Step 1/16 : FROM alpine:3.7 ---> 16566b7ed19e ... diff --git a/sample-functions/AlpineFunction/Dockerfile.arm64 b/sample-functions/AlpineFunction/Dockerfile.arm64 index 367569b8..bd7a42e0 100644 --- a/sample-functions/AlpineFunction/Dockerfile.arm64 +++ b/sample-functions/AlpineFunction/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.6 +FROM arm64v8/alpine:3.7 ADD https://github.com/alexellis/faas/releases/download/0.8.0/fwatchdog-arm64 /usr/bin/fwatchdog # COPY ./fwatchdog /usr/bin/ diff --git a/sample-functions/ApiKeyProtected-Secrets/Dockerfile b/sample-functions/ApiKeyProtected-Secrets/Dockerfile index 3004d988..a7274d2d 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.6 +FROM alpine:3.7 # 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 c72c9d9b..6ff1eb85 100644 --- a/sample-functions/CHelloWorld/src/Dockerfile +++ b/sample-functions/CHelloWorld/src/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 as builder +FROM alpine:3.7 as builder RUN apk add --no-cache curl \ && curl -SL https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index f7cadfe1..3ef77ad6 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index 67fe12b3..727ec2dd 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index 21037be4..7881e42c 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.6 +FROM alpine:3.7 # 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 f3dcfc32..41763521 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.6 +FROM alpine:3.7 # 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 ab2f20c8..5b387656 100644 --- a/sample-functions/HostnameIntent/Dockerfile +++ b/sample-functions/HostnameIntent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile index 9dae8f68..b798b2bb 100644 --- a/sample-functions/MarkdownRender/Dockerfile +++ b/sample-functions/MarkdownRender/Dockerfile @@ -14,7 +14,7 @@ COPY vendor vendor RUN go install -FROM alpine:3.6 +FROM alpine:3.7 # 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 f365c210..903b379d 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm diff --git a/sample-functions/NodeInfo/Dockerfile.arm64 b/sample-functions/NodeInfo/Dockerfile.arm64 index 81128824..973b9823 100644 --- a/sample-functions/NodeInfo/Dockerfile.arm64 +++ b/sample-functions/NodeInfo/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.6 +FROM arm64v8/alpine:3.7 RUN apk --update add nodejs nodejs-npm diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf index 28275bd0..66705244 100644 --- a/sample-functions/NodeInfo/Dockerfile.armhf +++ b/sample-functions/NodeInfo/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk --no-cache add nodejs nodejs-npm ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog-armhf /usr/bin/fwatchdog diff --git a/sample-functions/ResizeImageMagick/Dockerfile.armhf b/sample-functions/ResizeImageMagick/Dockerfile.armhf index ece9c9aa..9ec19e7e 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile.armhf +++ b/sample-functions/ResizeImageMagick/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM arm32v6/alpine:3.6 +FROM arm32v6/alpine:3.7 RUN apk --no-cache add imagemagick diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index de95ed67..c7dada33 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -14,7 +14,7 @@ COPY handler.go . RUN go install -FROM alpine:3.6 +FROM alpine:3.7 # Needed to reach the hub RUN apk --no-cache add ca-certificates diff --git a/sample-functions/figlet/Dockerfile b/sample-functions/figlet/Dockerfile index 5cff1d8d..4b4660e5 100644 --- a/sample-functions/figlet/Dockerfile +++ b/sample-functions/figlet/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/figlet/Dockerfile.armhf b/sample-functions/figlet/Dockerfile.armhf index e1fb7853..332db68d 100644 --- a/sample-functions/figlet/Dockerfile.armhf +++ b/sample-functions/figlet/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog-armhf /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/gif-maker/Dockerfile b/sample-functions/gif-maker/Dockerfile index db8e0ac5..5c3976da 100644 --- a/sample-functions/gif-maker/Dockerfile +++ b/sample-functions/gif-maker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk --no-cache add ffmpeg gifsicle curl \ && curl -LS https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog > /usr/bin/fwatchdog \ diff --git a/watchdog/README.md b/watchdog/README.md index 86cc439b..df81c8fb 100644 --- a/watchdog/README.md +++ b/watchdog/README.md @@ -34,7 +34,7 @@ Here's how to package your function if you don't want to use the CLI or have exi Example Dockerfile for an `echo` function: ``` -FROM alpine:3.5 +FROM alpine:3.7 ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog