Permalink
Browse files

Bump gateway and watchdog tags/versions

This commit bumps the non-arm gateway from 0.7.0 to 0.7.1 and the arm
variants from 0.6.9 to 0.7.0.

It also updates all watchdog versions to the 0.7.1 release.

Signed-off-by: John McCabe <john@johnmccabe.net>
  • Loading branch information...
johnmccabe authored and alexellis committed Feb 24, 2018
1 parent 1c2b5c4 commit 4e9d999554fb6f5e17c27fee225e1778117990df
Showing with 30 additions and 30 deletions.
  1. +1 −1 TestDrive.md
  2. +1 −1 docker-compose.arm64.yml
  3. +1 −1 docker-compose.extended.armhf.yml
  4. +1 −1 docker-compose.yml
  5. +1 −1 guide/deployment_swarm.md
  6. +1 −1 sample-functions/AlpineFunction/Dockerfile
  7. +1 −1 sample-functions/AlpineFunction/Dockerfile.arm64
  8. +1 −1 sample-functions/AlpineFunction/Dockerfile.armhf
  9. +1 −1 sample-functions/ApiKeyProtected-Secrets/Dockerfile
  10. +1 −1 sample-functions/ApiKeyProtected/Dockerfile
  11. +1 −1 sample-functions/BaseFunctions/cobol/Dockerfile
  12. +1 −1 sample-functions/BaseFunctions/coffee/Dockerfile
  13. +1 −1 sample-functions/BaseFunctions/dncore/Dockerfile
  14. +1 −1 sample-functions/BaseFunctions/golang/Dockerfile
  15. +1 −1 sample-functions/BaseFunctions/golang/Dockerfile.win
  16. +1 −1 sample-functions/BaseFunctions/java/Dockerfile
  17. +1 −1 sample-functions/BaseFunctions/node/Dockerfile
  18. +1 −1 sample-functions/BaseFunctions/python/Dockerfile
  19. +1 −1 sample-functions/CaptainsIntent/Dockerfile
  20. +1 −1 sample-functions/ChangeColorIntent/Dockerfile
  21. +1 −1 sample-functions/DockerHubStats/Dockerfile
  22. +1 −1 sample-functions/DockerHubStats/Dockerfile.armhf
  23. +1 −1 sample-functions/HostnameIntent/Dockerfile
  24. +1 −1 sample-functions/MarkdownRender/Dockerfile
  25. +1 −1 sample-functions/NodeInfo/Dockerfile.arm64
  26. +1 −1 sample-functions/Phantomjs/Dockerfile
  27. +1 −1 sample-functions/ResizeImageMagick/Dockerfile
  28. +1 −1 sample-functions/SentimentAnalysis/Dockerfile
  29. +1 −1 sample-functions/WebhookStash/Dockerfile
  30. +1 −1 sample-functions/gif-maker/Dockerfile
@@ -30,7 +30,7 @@ This one-shot script clones the code, sets up a Docker Swarm master node then de
# docker swarm init --advertise-addr eth0 && \
git clone https://github.com/openfaas/faas && \
cd faas && \
git checkout 0.7.0 && \
git checkout 0.7.1 && \
./deploy_stack.sh && \
docker service ls
```
@@ -5,7 +5,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock"
ports:
- 8080:8080
image: functions/gateway:0.6.9-arm64
image: functions/gateway:0.7.0-arm64
networks:
- functions
environment:
@@ -5,7 +5,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock"
ports:
- 8080:8080
image: functions/gateway:0.6.9-armhf
image: functions/gateway:0.7.0-armhf
networks:
- functions
environment:
@@ -3,7 +3,7 @@ services:
gateway:
ports:
- 8080:8080
image: functions/gateway:0.7.0
image: functions/gateway:0.7.1
networks:
- functions
environment:
@@ -35,7 +35,7 @@ Clone OpenFaaS and then checkout the latest stable release:
```
$ git clone https://github.com/openfaas/faas && \
cd faas && \
git checkout 0.7.0 && \
git checkout 0.7.1 && \
./deploy_stack.sh
```
@@ -1,6 +1,6 @@
FROM alpine:3.6
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
# COPY ./fwatchdog /usr/bin/
RUN chmod +x /usr/bin/fwatchdog
@@ -1,6 +1,6 @@
FROM arm64v8/alpine:3.6
ADD https://github.com/alexellis/faas/releases/download/0.7.0/fwatchdog-arm64 /usr/bin/fwatchdog
ADD https://github.com/alexellis/faas/releases/download/0.7.1/fwatchdog-arm64 /usr/bin/fwatchdog
# COPY ./fwatchdog /usr/bin/
RUN chmod +x /usr/bin/fwatchdog
@@ -1,6 +1,6 @@
FROM alpine:3.6
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog-armhf /usr/bin/fwatchdog
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog-armhf /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
# Populate example here
@@ -4,7 +4,7 @@ MAINTAINER alex@openfaas.com
ENTRYPOINT []
RUN apk --no-cache add make curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/ApiKeyProtected
@@ -4,7 +4,7 @@ MAINTAINER alex@openfaas.com
ENTRYPOINT []
RUN apk --no-cache add make curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/ApiKeyProtected
@@ -1,6 +1,6 @@
FROM toricls/gnucobol:latest
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
WORKDIR /root/
@@ -1,6 +1,6 @@
FROM node:6.9.1-alpine
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
WORKDIR /root/
@@ -1,6 +1,6 @@
FROM microsoft/dotnet:sdk
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
@@ -8,7 +8,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/golang
RUN go install
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess "/go/bin/golang"
@@ -6,7 +6,7 @@ WORKDIR /go/src/github.com/openfaas/faas/sample-functions/golang
COPY . /go/src/github.com/openfaas/faas/sample-functions/golang
RUN go build
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog.exe /watchdog.exe
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog.exe /watchdog.exe
EXPOSE 8080
ENV fprocess="golang.exe"
@@ -1,6 +1,6 @@
FROM openjdk:8u121-jdk-alpine
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
WORKDIR /root/
@@ -1,6 +1,6 @@
FROM node:6.9.1-alpine
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
WORKDIR /root/
@@ -1,6 +1,6 @@
FROM python:2.7-alpine
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
WORKDIR /root/
@@ -1,7 +1,7 @@
FROM alpine:3.6
RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
COPY package.json .
@@ -1,7 +1,7 @@
FROM alpine:3.6
RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
#COPY ./fwatchdog /usr/bin/
RUN chmod +x /usr/bin/fwatchdog
@@ -4,7 +4,7 @@ MAINTAINER alex@openfaas.com
ENTRYPOINT []
RUN apk --no-cache add make curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
@@ -4,7 +4,7 @@ MAINTAINER alex@openfaas.com
ENTRYPOINT []
RUN apk --no-cache add make curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
@@ -1,7 +1,7 @@
FROM alpine:3.6
RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
COPY package.json .
@@ -4,7 +4,7 @@ MAINTAINER alex@openfaas.com
ENTRYPOINT []
RUN apk --no-cache add make curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/MarkdownRender
@@ -2,7 +2,7 @@ FROM arm64v8/alpine:3.6
RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog-arm64 /usr/bin/fwatchdog
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog-arm64 /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
COPY package.json .
@@ -1,6 +1,6 @@
FROM alexellis2/phantomjs-docker:latest
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess="phantomjs /dev/stdin"
@@ -1,6 +1,6 @@
FROM v4tech/imagemagick
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess "convert - -resize 50% fd:1"
@@ -3,7 +3,7 @@ FROM python:2.7-alpine
RUN pip install textblob && \
python -m textblob.download_corpora
ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
WORKDIR /root/
@@ -4,7 +4,7 @@ MAINTAINER alex@openfaas.com
ENTRYPOINT []
RUN apk --no-cache add make curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/WebhookStash
@@ -1,7 +1,7 @@
FROM alpine:3.6
RUN apk --no-cache add ffmpeg gifsicle curl \
&& curl -LS https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \
&& curl -LS https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl
WORKDIR /root/

0 comments on commit 4e9d999

Please sign in to comment.