Bump swarm versions

Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis 2018-03-13 17:30:28 +00:00
parent 806e7f88c4
commit 3897d1f54e
3 changed files with 13 additions and 13 deletions

View File

@ -3,7 +3,7 @@ services:
gateway: gateway:
ports: ports:
- 8080:8080 - 8080:8080
image: functions/gateway:0.7.0-armhf image: functions/gateway:0.7.3-armhf
networks: networks:
- functions - functions
environment: environment:
@ -15,10 +15,10 @@ services:
faas_nats_port: 4222 faas_nats_port: 4222
deploy: deploy:
resources: resources:
limits: # limits: # uncomment to enable limits
memory: 100M # memory: 100M
reservations: reservations:
memory: 50M memory: 100M
restart_policy: restart_policy:
condition: on-failure condition: on-failure
delay: 5s delay: 5s
@ -34,7 +34,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
# ports: # ports:
# - 8081:8080 # - 8081:8080
image: functions/faas-swarm:0.1.5-armhf image: functions/faas-swarm:0.2.1-armhf
networks: networks:
- functions - functions
environment: environment:
@ -47,10 +47,10 @@ services:
- 'node.role == manager' - 'node.role == manager'
- 'node.platform.os == linux' - 'node.platform.os == linux'
resources: resources:
limits: # limits: # uncomment to enable limits
memory: 100M # memory: 100M
reservations: reservations:
memory: 50M memory: 100M
restart_policy: restart_policy:
condition: on-failure condition: on-failure
delay: 5s delay: 5s

View File

@ -1,4 +1,4 @@
FROM alexellis2/go-armhf:1.7.4 FROM golang:1.9.2 as build
WORKDIR /go/src/github.com/openfaas/faas/gateway WORKDIR /go/src/github.com/openfaas/faas/gateway
@ -13,7 +13,7 @@ COPY plugin plugin
COPY queue queue COPY queue queue
COPY server.go . COPY server.go .
RUN GOARM=6 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.6
WORKDIR /root/ WORKDIR /root/
@ -27,4 +27,3 @@ COPY --from=0 /go/src/github.com/openfaas/faas/gateway/gateway .
COPY assets assets COPY assets assets
RUN sed -ie s/store.json/store-armhf.json/g /root/assets/script/funcstore.js RUN sed -ie s/store.json/store-armhf.json/g /root/assets/script/funcstore.js
CMD ["./gateway"] CMD ["./gateway"]

View File

@ -13,11 +13,12 @@ fi
echo "$1" echo "$1"
if [ "$1" ] ; then if [ "$1" ] ; then
eTAG=$1 eTAG=$1
if [ "$arch" = "armv7l" ] ; then
eTAG="$1-armhf"
fi
fi fi
echo Building functions/gateway:$eTAG echo Building functions/gateway:$eTAG
docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \ docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
-t functions/gateway:$eTAG . -f $dockerfile --no-cache -t functions/gateway:$eTAG . -f $dockerfile --no-cache