From 4d73e21906254edc2fd0a3aafd9e30d0856ccca6 Mon Sep 17 00:00:00 2001 From: "Martin Dekov (VMware)" Date: Mon, 17 Sep 2018 04:08:58 -0700 Subject: [PATCH] Bump watchdog to 0.9.4 Bumping the watchdog to 0.9.4 in mentioned places Signed-off-by: Martin Dekov (VMware) --- DEV.md | 8 ++++---- sample-functions/AlpineFunction/Dockerfile | 2 +- sample-functions/AlpineFunction/Dockerfile.arm64 | 2 +- sample-functions/AlpineFunction/Dockerfile.armhf | 2 +- sample-functions/ApiKeyProtected-Secrets/Dockerfile | 2 +- sample-functions/BaseFunctions/R/Dockerfile | 2 +- sample-functions/BaseFunctions/cobol/Dockerfile | 2 +- sample-functions/BaseFunctions/coffee/Dockerfile | 2 +- sample-functions/BaseFunctions/dncore/Dockerfile | 2 +- sample-functions/BaseFunctions/golang/Dockerfile | 2 +- sample-functions/BaseFunctions/golang/Dockerfile.win | 2 +- sample-functions/BaseFunctions/java/Dockerfile | 2 +- sample-functions/BaseFunctions/node/Dockerfile | 2 +- sample-functions/BaseFunctions/python/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/Phantomjs/Dockerfile | 2 +- sample-functions/ResizeImageMagick/Dockerfile | 2 +- sample-functions/ResizeImageMagick/Dockerfile.armhf | 2 +- sample-functions/SentimentAnalysis/Dockerfile | 2 +- sample-functions/SentimentAnalysis/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 | 4 ++-- 34 files changed, 38 insertions(+), 38 deletions(-) diff --git a/DEV.md b/DEV.md index e4c96ebe..b227269b 100644 --- a/DEV.md +++ b/DEV.md @@ -35,7 +35,7 @@ RUN go get github.com/microcosm-cc/bluemonday && \ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app . -ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV fprocess="/go/src/app/app" @@ -61,7 +61,7 @@ Update the Docker stack with this: ``` FROM alpine:latest -ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV fprocess="wc" @@ -86,14 +86,14 @@ You can optimize Docker to cache getting the watchdog by using curl, instead of To do so, replace the related lines with: ``` RUN apt-get update && apt-get install -y curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ``` or with the following for Alpine based images: ``` RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog ``` diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile index a9dc6779..776a46f6 100644 --- a/sample-functions/AlpineFunction/Dockerfile +++ b/sample-functions/AlpineFunction/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog # Populate example here diff --git a/sample-functions/AlpineFunction/Dockerfile.arm64 b/sample-functions/AlpineFunction/Dockerfile.arm64 index c04ee441..c6e972a1 100644 --- a/sample-functions/AlpineFunction/Dockerfile.arm64 +++ b/sample-functions/AlpineFunction/Dockerfile.arm64 @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-arm64 > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-arm64 > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog # Populate example here diff --git a/sample-functions/AlpineFunction/Dockerfile.armhf b/sample-functions/AlpineFunction/Dockerfile.armhf index 510cb7f6..aa62e104 100644 --- a/sample-functions/AlpineFunction/Dockerfile.armhf +++ b/sample-functions/AlpineFunction/Dockerfile.armhf @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog # Populate example here diff --git a/sample-functions/ApiKeyProtected-Secrets/Dockerfile b/sample-functions/ApiKeyProtected-Secrets/Dockerfile index 6db546df..59a34e04 100644 --- a/sample-functions/ApiKeyProtected-Secrets/Dockerfile +++ b/sample-functions/ApiKeyProtected-Secrets/Dockerfile @@ -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.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /go/src/github.com/openfaas/faas/sample-functions/ApiKeyProtected diff --git a/sample-functions/BaseFunctions/R/Dockerfile b/sample-functions/BaseFunctions/R/Dockerfile index 78f81d23..338fa354 100644 --- a/sample-functions/BaseFunctions/R/Dockerfile +++ b/sample-functions/BaseFunctions/R/Dockerfile @@ -1,7 +1,7 @@ FROM artemklevtsov/r-alpine:latest RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/cobol/Dockerfile b/sample-functions/BaseFunctions/cobol/Dockerfile index 4e0068fe..e2625733 100644 --- a/sample-functions/BaseFunctions/cobol/Dockerfile +++ b/sample-functions/BaseFunctions/cobol/Dockerfile @@ -1,7 +1,7 @@ FROM toricls/gnucobol:latest RUN apt-get update && apt-get install -y curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/sample-functions/BaseFunctions/coffee/Dockerfile b/sample-functions/BaseFunctions/coffee/Dockerfile index c8cead07..ba2a9825 100644 --- a/sample-functions/BaseFunctions/coffee/Dockerfile +++ b/sample-functions/BaseFunctions/coffee/Dockerfile @@ -1,7 +1,7 @@ FROM node:6.9.1-alpine RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/dncore/Dockerfile b/sample-functions/BaseFunctions/dncore/Dockerfile index 5b3a847a..954cd55c 100644 --- a/sample-functions/BaseFunctions/dncore/Dockerfile +++ b/sample-functions/BaseFunctions/dncore/Dockerfile @@ -1,7 +1,7 @@ FROM microsoft/dotnet:sdk RUN apt-get update && apt-get install -y curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/sample-functions/BaseFunctions/golang/Dockerfile b/sample-functions/BaseFunctions/golang/Dockerfile index 4d89004a..13e5b6b6 100644 --- a/sample-functions/BaseFunctions/golang/Dockerfile +++ b/sample-functions/BaseFunctions/golang/Dockerfile @@ -9,7 +9,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/golang RUN go install RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog ENV fprocess "/go/bin/golang" diff --git a/sample-functions/BaseFunctions/golang/Dockerfile.win b/sample-functions/BaseFunctions/golang/Dockerfile.win index 57103e7d..a931c12f 100644 --- a/sample-functions/BaseFunctions/golang/Dockerfile.win +++ b/sample-functions/BaseFunctions/golang/Dockerfile.win @@ -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.8.0/fwatchdog.exe /watchdog.exe +ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog.exe /watchdog.exe EXPOSE 8080 ENV fprocess="golang.exe" diff --git a/sample-functions/BaseFunctions/java/Dockerfile b/sample-functions/BaseFunctions/java/Dockerfile index 41282cc0..1114062b 100644 --- a/sample-functions/BaseFunctions/java/Dockerfile +++ b/sample-functions/BaseFunctions/java/Dockerfile @@ -1,7 +1,7 @@ FROM openjdk:8u121-jdk-alpine RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/node/Dockerfile b/sample-functions/BaseFunctions/node/Dockerfile index f85c59fa..71307e48 100644 --- a/sample-functions/BaseFunctions/node/Dockerfile +++ b/sample-functions/BaseFunctions/node/Dockerfile @@ -1,7 +1,7 @@ FROM node:6.9.1-alpine RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/python/Dockerfile b/sample-functions/BaseFunctions/python/Dockerfile index 985fb6a5..7be41e18 100644 --- a/sample-functions/BaseFunctions/python/Dockerfile +++ b/sample-functions/BaseFunctions/python/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7-alpine RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/CHelloWorld/src/Dockerfile b/sample-functions/CHelloWorld/src/Dockerfile index 60d0c2d0..115099ea 100644 --- a/sample-functions/CHelloWorld/src/Dockerfile +++ b/sample-functions/CHelloWorld/src/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 as builder RUN apk add --no-cache curl \ - && curl -SL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -SL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && apk --no-cache del curl diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index 0f3e369c..eab67b2d 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index 9f979af6..592c47fe 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index 28b68620..afc5a11b 100644 --- a/sample-functions/DockerHubStats/Dockerfile +++ b/sample-functions/DockerHubStats/Dockerfile @@ -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.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats diff --git a/sample-functions/DockerHubStats/Dockerfile.armhf b/sample-functions/DockerHubStats/Dockerfile.armhf index a3ecec28..07d4b075 100644 --- a/sample-functions/DockerHubStats/Dockerfile.armhf +++ b/sample-functions/DockerHubStats/Dockerfile.armhf @@ -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.9.0/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile index 1055d728..46f122b5 100644 --- a/sample-functions/HostnameIntent/Dockerfile +++ b/sample-functions/HostnameIntent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile index 59f3c474..b03b1cc6 100644 --- a/sample-functions/MarkdownRender/Dockerfile +++ b/sample-functions/MarkdownRender/Dockerfile @@ -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.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /go/src/github.com/openfaas/faas/sample-functions/MarkdownRender diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index 5f7f3850..e73697e6 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/NodeInfo/Dockerfile.arm64 b/sample-functions/NodeInfo/Dockerfile.arm64 index e226ed49..9efe5b31 100644 --- a/sample-functions/NodeInfo/Dockerfile.arm64 +++ b/sample-functions/NodeInfo/Dockerfile.arm64 @@ -3,7 +3,7 @@ FROM alpine:3.7 RUN apk --update add nodejs nodejs-npm RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-arm64 > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-arm64 > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf index 2f4038b7..9cd62fd2 100644 --- a/sample-functions/NodeInfo/Dockerfile.armhf +++ b/sample-functions/NodeInfo/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN apk --no-cache add nodejs nodejs-npm RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/Phantomjs/Dockerfile b/sample-functions/Phantomjs/Dockerfile index 32cf9bd7..6440eb90 100644 --- a/sample-functions/Phantomjs/Dockerfile +++ b/sample-functions/Phantomjs/Dockerfile @@ -1,7 +1,7 @@ FROM alexellis2/phantomjs-docker:latest RUN apt-get update && apt-get install -y curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/sample-functions/ResizeImageMagick/Dockerfile b/sample-functions/ResizeImageMagick/Dockerfile index a2ed7156..7b1073d3 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile +++ b/sample-functions/ResizeImageMagick/Dockerfile @@ -1,7 +1,7 @@ FROM v4tech/imagemagick RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog ENV fprocess "convert - -resize 50% fd:1" diff --git a/sample-functions/ResizeImageMagick/Dockerfile.armhf b/sample-functions/ResizeImageMagick/Dockerfile.armhf index b9b7c11f..83753b5c 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile.armhf +++ b/sample-functions/ResizeImageMagick/Dockerfile.armhf @@ -3,7 +3,7 @@ FROM arm32v6/alpine:3.7 RUN apk --no-cache add imagemagick RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog ENV fprocess "convert - -resize 50% fd:1" diff --git a/sample-functions/SentimentAnalysis/Dockerfile b/sample-functions/SentimentAnalysis/Dockerfile index 1553ccd3..8bc3f0d4 100644 --- a/sample-functions/SentimentAnalysis/Dockerfile +++ b/sample-functions/SentimentAnalysis/Dockerfile @@ -4,7 +4,7 @@ RUN pip install textblob && \ python -m textblob.download_corpora RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/SentimentAnalysis/Dockerfile.armhf b/sample-functions/SentimentAnalysis/Dockerfile.armhf index 75244e5a..96544cac 100644 --- a/sample-functions/SentimentAnalysis/Dockerfile.armhf +++ b/sample-functions/SentimentAnalysis/Dockerfile.armhf @@ -4,7 +4,7 @@ RUN pip install textblob && \ python -m textblob.download_corpora RUN apt-get update && apt-get install -y curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index 2cca96b1..1693dd4c 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -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.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog WORKDIR /go/src/github.com/openfaas/faas/sample-functions/WebhookStash diff --git a/sample-functions/figlet/Dockerfile b/sample-functions/figlet/Dockerfile index 04026925..dfe73093 100644 --- a/sample-functions/figlet/Dockerfile +++ b/sample-functions/figlet/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog RUN apk add --no-cache figlet diff --git a/sample-functions/figlet/Dockerfile.armhf b/sample-functions/figlet/Dockerfile.armhf index f7e09ca3..88e44d2b 100644 --- a/sample-functions/figlet/Dockerfile.armhf +++ b/sample-functions/figlet/Dockerfile.armhf @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog RUN apk add --no-cache figlet diff --git a/sample-functions/gif-maker/Dockerfile b/sample-functions/gif-maker/Dockerfile index f37a17c4..1dd6f808 100644 --- a/sample-functions/gif-maker/Dockerfile +++ b/sample-functions/gif-maker/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN apk --no-cache add ffmpeg gifsicle curl \ - && curl -LS https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -LS https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && apk del curl WORKDIR /root/ diff --git a/watchdog/README.md b/watchdog/README.md index 2a6a5798..c600a154 100644 --- a/watchdog/README.md +++ b/watchdog/README.md @@ -36,7 +36,7 @@ Example Dockerfile for an `echo` function: ``` FROM alpine:3.7 -ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog # Define your binary here @@ -50,7 +50,7 @@ You can optimize Docker to cache getting the watchdog by using curl, instead of To do so, replace the related lines with: ``` RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog ```