diff --git a/DEV.md b/DEV.md index 421b9755..56d0ed8b 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.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/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.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV fprocess="wc" diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile index 9055091f..dfb4fb81 100644 --- a/sample-functions/AlpineFunction/Dockerfile +++ b/sample-functions/AlpineFunction/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin # COPY ./fwatchdog /usr/bin/ RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/AlpineFunction/Dockerfile.arm64 b/sample-functions/AlpineFunction/Dockerfile.arm64 index 97ebd1a0..367569b8 100644 --- a/sample-functions/AlpineFunction/Dockerfile.arm64 +++ b/sample-functions/AlpineFunction/Dockerfile.arm64 @@ -1,6 +1,6 @@ FROM arm64v8/alpine:3.6 -ADD https://github.com/alexellis/faas/releases/download/0.7.9/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/ RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/AlpineFunction/Dockerfile.armhf b/sample-functions/AlpineFunction/Dockerfile.armhf index 1b317dd2..6a28a943 100644 --- a/sample-functions/AlpineFunction/Dockerfile.armhf +++ b/sample-functions/AlpineFunction/Dockerfile.armhf @@ -1,6 +1,6 @@ FROM alpine:3.7 -ADD https://github.com/openfaas/faas/releases/download/0.7.9/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 # Populate example here diff --git a/sample-functions/ApiKeyProtected-Secrets/Dockerfile b/sample-functions/ApiKeyProtected-Secrets/Dockerfile index e74335aa..3004d988 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.7.9/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 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 f6cec36c..6b103b1d 100644 --- a/sample-functions/BaseFunctions/R/Dockerfile +++ b/sample-functions/BaseFunctions/R/Dockerfile @@ -1,6 +1,6 @@ FROM artemklevtsov/r-alpine:latest -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/cobol/Dockerfile b/sample-functions/BaseFunctions/cobol/Dockerfile index d1d7af30..05319199 100644 --- a/sample-functions/BaseFunctions/cobol/Dockerfile +++ b/sample-functions/BaseFunctions/cobol/Dockerfile @@ -1,6 +1,6 @@ FROM toricls/gnucobol:latest -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/coffee/Dockerfile b/sample-functions/BaseFunctions/coffee/Dockerfile index 3f366e7e..0cae4de0 100644 --- a/sample-functions/BaseFunctions/coffee/Dockerfile +++ b/sample-functions/BaseFunctions/coffee/Dockerfile @@ -1,6 +1,6 @@ FROM node:6.9.1-alpine -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/dncore/Dockerfile b/sample-functions/BaseFunctions/dncore/Dockerfile index b2bc6622..6e57de43 100644 --- a/sample-functions/BaseFunctions/dncore/Dockerfile +++ b/sample-functions/BaseFunctions/dncore/Dockerfile @@ -1,6 +1,6 @@ FROM microsoft/dotnet:sdk -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 diff --git a/sample-functions/BaseFunctions/golang/Dockerfile b/sample-functions/BaseFunctions/golang/Dockerfile index 37ee6a33..92b42cb2 100644 --- a/sample-functions/BaseFunctions/golang/Dockerfile +++ b/sample-functions/BaseFunctions/golang/Dockerfile @@ -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.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN 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 fde6ab25..41a60a03 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.7.9/fwatchdog.exe /watchdog.exe +ADD https://github.com/openfaas/faas/releases/download/0.8.0/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 c25d4238..0fad1bad 100644 --- a/sample-functions/BaseFunctions/java/Dockerfile +++ b/sample-functions/BaseFunctions/java/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8u121-jdk-alpine -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/node/Dockerfile b/sample-functions/BaseFunctions/node/Dockerfile index 3f79e2a7..464b62f9 100644 --- a/sample-functions/BaseFunctions/node/Dockerfile +++ b/sample-functions/BaseFunctions/node/Dockerfile @@ -1,6 +1,6 @@ FROM node:6.9.1-alpine -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/BaseFunctions/python/Dockerfile b/sample-functions/BaseFunctions/python/Dockerfile index 3bb9ec29..afd7fadd 100644 --- a/sample-functions/BaseFunctions/python/Dockerfile +++ b/sample-functions/BaseFunctions/python/Dockerfile @@ -1,6 +1,6 @@ FROM python:2.7-alpine -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/CHelloWorld/src/Dockerfile b/sample-functions/CHelloWorld/src/Dockerfile index ef21ec73..c72c9d9b 100644 --- a/sample-functions/CHelloWorld/src/Dockerfile +++ b/sample-functions/CHelloWorld/src/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 as builder RUN apk add --no-cache curl \ - && curl -SL https://github.com/openfaas/faas/releases/download/0.7.9/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 \ && apk --no-cache del curl diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index 3e34309a..f7cadfe1 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -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.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index b5f64df1..67fe12b3 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -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.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin #COPY ./fwatchdog /usr/bin/ RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index 42936ff3..21037be4 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.7.9/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 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 72770fe4..f3dcfc32 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.7.9/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.8.0/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 7a822142..ab2f20c8 100644 --- a/sample-functions/HostnameIntent/Dockerfile +++ b/sample-functions/HostnameIntent/Dockerfile @@ -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.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile index 99585472..9dae8f68 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.7.9/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 WORKDIR /go/src/github.com/openfaas/faas/sample-functions/MarkdownRender diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index 946c3faa..f365c210 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.6 RUN apk --update add nodejs nodejs-npm -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/NodeInfo/Dockerfile.arm64 b/sample-functions/NodeInfo/Dockerfile.arm64 index a0d659ec..81128824 100644 --- a/sample-functions/NodeInfo/Dockerfile.arm64 +++ b/sample-functions/NodeInfo/Dockerfile.arm64 @@ -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.9/fwatchdog-arm64 /usr/bin/fwatchdog +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog-arm64 /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf index 2a57027e..28275bd0 100644 --- a/sample-functions/NodeInfo/Dockerfile.armhf +++ b/sample-functions/NodeInfo/Dockerfile.armhf @@ -1,7 +1,7 @@ FROM alpine:3.6 RUN apk --no-cache add nodejs nodejs-npm -ADD https://github.com/openfaas/faas/releases/download/0.7.9/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 COPY package.json . diff --git a/sample-functions/Phantomjs/Dockerfile b/sample-functions/Phantomjs/Dockerfile index 79b017f3..2dc852a9 100644 --- a/sample-functions/Phantomjs/Dockerfile +++ b/sample-functions/Phantomjs/Dockerfile @@ -1,6 +1,6 @@ FROM alexellis2/phantomjs-docker:latest -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV fprocess="phantomjs /dev/stdin" diff --git a/sample-functions/ResizeImageMagick/Dockerfile b/sample-functions/ResizeImageMagick/Dockerfile index 63ca1b15..07f57bb9 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile +++ b/sample-functions/ResizeImageMagick/Dockerfile @@ -1,6 +1,6 @@ FROM v4tech/imagemagick -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN 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 9d2e34b9..ece9c9aa 100644 --- a/sample-functions/ResizeImageMagick/Dockerfile.armhf +++ b/sample-functions/ResizeImageMagick/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM arm32v6/alpine:3.6 RUN apk --no-cache add imagemagick -ADD https://github.com/openfaas/faas/releases/download/0.7.9/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 ENV fprocess "convert - -resize 50% fd:1" diff --git a/sample-functions/SentimentAnalysis/Dockerfile b/sample-functions/SentimentAnalysis/Dockerfile index 4204ee2a..3451c2cd 100644 --- a/sample-functions/SentimentAnalysis/Dockerfile +++ b/sample-functions/SentimentAnalysis/Dockerfile @@ -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.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/SentimentAnalysis/Dockerfile.armhf b/sample-functions/SentimentAnalysis/Dockerfile.armhf index 9efdeaa1..b9a7091f 100644 --- a/sample-functions/SentimentAnalysis/Dockerfile.armhf +++ b/sample-functions/SentimentAnalysis/Dockerfile.armhf @@ -3,7 +3,7 @@ FROM arm32v7/python:2.7-slim RUN pip install textblob && \ python -m textblob.download_corpora -ADD https://github.com/openfaas/faas/releases/download/0.7.9/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 WORKDIR /root/ diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index 08629337..de95ed67 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.7.9/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 WORKDIR /go/src/github.com/openfaas/faas/sample-functions/WebhookStash diff --git a/sample-functions/figlet/Dockerfile b/sample-functions/figlet/Dockerfile index bef87ecd..5cff1d8d 100644 --- a/sample-functions/figlet/Dockerfile +++ b/sample-functions/figlet/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN 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 b4bc31b7..e1fb7853 100644 --- a/sample-functions/figlet/Dockerfile.armhf +++ b/sample-functions/figlet/Dockerfile.armhf @@ -1,6 +1,6 @@ FROM alpine:3.6 -ADD https://github.com/openfaas/faas/releases/download/0.7.9/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 apk add --no-cache figlet diff --git a/sample-functions/gif-maker/Dockerfile b/sample-functions/gif-maker/Dockerfile index 1baec85e..db8e0ac5 100644 --- a/sample-functions/gif-maker/Dockerfile +++ b/sample-functions/gif-maker/Dockerfile @@ -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.9/fwatchdog > /usr/bin/fwatchdog \ + && curl -LS https://github.com/openfaas/faas/releases/download/0.8.0/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 5e7bdc2a..86cc439b 100644 --- a/watchdog/README.md +++ b/watchdog/README.md @@ -36,7 +36,7 @@ Example Dockerfile for an `echo` function: ``` FROM alpine:3.5 -ADD https://github.com/openfaas/faas/releases/download/0.7.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.8.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog # Define your binary here