mirror of
https://github.com/openfaas/faas.git
synced 2025-06-19 20:46:41 +00:00
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) <iyovcheva@vmware.com>
This commit is contained in:
committed by
Alex Ellis
parent
975cf4be7c
commit
7f6295c9cf
@ -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 \
|
&& 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 .
|
&& CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
|
||||||
|
|
||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
RUN addgroup -S app \
|
RUN addgroup -S app \
|
||||||
&& adduser -S -g app app
|
&& adduser -S -g app app
|
||||||
|
@ -20,7 +20,7 @@ COPY server.go .
|
|||||||
#RUN license-check -path ./ --verbose=false \
|
#RUN license-check -path ./ --verbose=false \
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
|
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 \
|
RUN addgroup -S app \
|
||||||
&& adduser -S -g app app
|
&& adduser -S -g app app
|
||||||
|
@ -15,7 +15,7 @@ COPY server.go .
|
|||||||
|
|
||||||
RUN GOARM=7 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gateway .
|
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/
|
WORKDIR /root/
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
2
gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile
generated
vendored
2
gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile
generated
vendored
@ -6,7 +6,7 @@ COPY main.go .
|
|||||||
|
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
|
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
|
RUN apk add --no-cache ca-certificates
|
||||||
WORKDIR /root/
|
WORKDIR /root/
|
||||||
|
|
||||||
|
2
gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf
generated
vendored
2
gateway/vendor/github.com/openfaas/nats-queue-worker/queue-worker/Dockerfile.armhf
generated
vendored
@ -6,7 +6,7 @@ COPY main.go .
|
|||||||
|
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
|
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
|
RUN apk add --no-cache ca-certificates
|
||||||
WORKDIR /root/
|
WORKDIR /root/
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ The function watchdog is cross-compiled through our CI process on a 64-bit PC.
|
|||||||
|
|
||||||
**Functions on armhf**
|
**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
|
### Initialize Swarm Mode
|
||||||
|
|
||||||
@ -142,7 +142,7 @@ $ faas-cli build -f callme.yml
|
|||||||
Building: alexellis/callme:armhf with node template. Please wait..
|
Building: alexellis/callme:armhf with node template. Please wait..
|
||||||
docker build -t alexellis/callme:armhf .
|
docker build -t alexellis/callme:armhf .
|
||||||
Sending build context to Docker daemon 8.704kB
|
Sending build context to Docker daemon 8.704kB
|
||||||
Step 1/16 : FROM alpine:3.6
|
Step 1/16 : FROM alpine:3.7
|
||||||
---> 16566b7ed19e
|
---> 16566b7ed19e
|
||||||
...
|
...
|
||||||
|
|
||||||
|
@ -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
|
ADD https://github.com/alexellis/faas/releases/download/0.8.0/fwatchdog-arm64 /usr/bin/fwatchdog
|
||||||
# COPY ./fwatchdog /usr/bin/
|
# COPY ./fwatchdog /usr/bin/
|
||||||
|
@ -14,7 +14,7 @@ COPY handler.go .
|
|||||||
|
|
||||||
RUN go install
|
RUN go install
|
||||||
|
|
||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
# 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,4 @@
|
|||||||
FROM alpine:3.6 as builder
|
FROM alpine:3.7 as builder
|
||||||
RUN apk add --no-cache curl \
|
RUN apk add --no-cache curl \
|
||||||
&& curl -SL https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog > /usr/bin/fwatchdog \
|
&& curl -SL https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog > /usr/bin/fwatchdog \
|
||||||
&& chmod +x /usr/bin/fwatchdog \
|
&& chmod +x /usr/bin/fwatchdog \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
||||||
|
@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
|
|||||||
|
|
||||||
RUN make install
|
RUN make install
|
||||||
|
|
||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
# 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.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
# 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,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
||||||
|
@ -14,7 +14,7 @@ COPY vendor vendor
|
|||||||
|
|
||||||
RUN go install
|
RUN go install
|
||||||
|
|
||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
# 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,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM arm64v8/alpine:3.6
|
FROM arm64v8/alpine:3.7
|
||||||
|
|
||||||
RUN apk --update add nodejs nodejs-npm
|
RUN apk --update add nodejs nodejs-npm
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
RUN apk --no-cache add nodejs nodejs-npm
|
RUN apk --no-cache add nodejs nodejs-npm
|
||||||
|
|
||||||
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog-armhf /usr/bin/fwatchdog
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog-armhf /usr/bin/fwatchdog
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM arm32v6/alpine:3.6
|
FROM arm32v6/alpine:3.7
|
||||||
|
|
||||||
RUN apk --no-cache add imagemagick
|
RUN apk --no-cache add imagemagick
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ COPY handler.go .
|
|||||||
|
|
||||||
RUN go install
|
RUN go install
|
||||||
|
|
||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
# 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,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
||||||
RUN chmod +x /usr/bin/fwatchdog
|
RUN chmod +x /usr/bin/fwatchdog
|
||||||
|
@ -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
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog-armhf /usr/bin/fwatchdog
|
||||||
RUN chmod +x /usr/bin/fwatchdog
|
RUN chmod +x /usr/bin/fwatchdog
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.6
|
FROM alpine:3.7
|
||||||
|
|
||||||
RUN apk --no-cache add ffmpeg gifsicle curl \
|
RUN apk --no-cache add ffmpeg gifsicle curl \
|
||||||
&& curl -LS https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog > /usr/bin/fwatchdog \
|
&& curl -LS https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog > /usr/bin/fwatchdog \
|
||||||
|
@ -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:
|
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
|
ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin
|
||||||
RUN chmod +x /usr/bin/fwatchdog
|
RUN chmod +x /usr/bin/fwatchdog
|
||||||
|
Reference in New Issue
Block a user