mirror of
https://github.com/openfaas/faas.git
synced 2025-06-10 17:26:47 +00:00
Bump swarm versions
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
parent
806e7f88c4
commit
3897d1f54e
@ -3,7 +3,7 @@ services:
|
||||
gateway:
|
||||
ports:
|
||||
- 8080:8080
|
||||
image: functions/gateway:0.7.0-armhf
|
||||
image: functions/gateway:0.7.3-armhf
|
||||
networks:
|
||||
- functions
|
||||
environment:
|
||||
@ -15,10 +15,10 @@ services:
|
||||
faas_nats_port: 4222
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
memory: 100M
|
||||
# limits: # uncomment to enable limits
|
||||
# memory: 100M
|
||||
reservations:
|
||||
memory: 50M
|
||||
memory: 100M
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
@ -34,7 +34,7 @@ services:
|
||||
- "/var/run/docker.sock:/var/run/docker.sock"
|
||||
# ports:
|
||||
# - 8081:8080
|
||||
image: functions/faas-swarm:0.1.5-armhf
|
||||
image: functions/faas-swarm:0.2.1-armhf
|
||||
networks:
|
||||
- functions
|
||||
environment:
|
||||
@ -47,10 +47,10 @@ services:
|
||||
- 'node.role == manager'
|
||||
- 'node.platform.os == linux'
|
||||
resources:
|
||||
limits:
|
||||
memory: 100M
|
||||
# limits: # uncomment to enable limits
|
||||
# memory: 100M
|
||||
reservations:
|
||||
memory: 50M
|
||||
memory: 100M
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
|
@ -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
|
||||
|
||||
@ -13,7 +13,7 @@ COPY plugin plugin
|
||||
COPY queue queue
|
||||
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
|
||||
WORKDIR /root/
|
||||
@ -27,4 +27,3 @@ COPY --from=0 /go/src/github.com/openfaas/faas/gateway/gateway .
|
||||
COPY assets assets
|
||||
RUN sed -ie s/store.json/store-armhf.json/g /root/assets/script/funcstore.js
|
||||
CMD ["./gateway"]
|
||||
|
||||
|
@ -13,11 +13,12 @@ fi
|
||||
echo "$1"
|
||||
if [ "$1" ] ; then
|
||||
eTAG=$1
|
||||
if [ "$arch" = "armv7l" ] ; then
|
||||
eTAG="$1-armhf"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo Building functions/gateway:$eTAG
|
||||
|
||||
docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
|
||||
-t functions/gateway:$eTAG . -f $dockerfile --no-cache
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user