diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile index 6feb6e6b..25e7cffb 100644 --- a/sample-functions/AlpineFunction/Dockerfile +++ b/sample-functions/AlpineFunction/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 5bd247aa..56be2ce5 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.6.9/fwatchdog-arm64 /usr/bin/fwatchdog +ADD https://github.com/alexellis/faas/releases/download/0.7.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 1f4d5409..2b9a3dbe 100644 --- a/sample-functions/AlpineFunction/Dockerfile.armhf +++ b/sample-functions/AlpineFunction/Dockerfile.armhf @@ -1,6 +1,6 @@ FROM alpine:3.6 -ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog-armhf /usr/bin/fwatchdog +ADD https://github.com/openfaas/faas/releases/download/0.7.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 29fe5d33..e87a83b0 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.6.9/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.7.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/ApiKeyProtected/Dockerfile b/sample-functions/ApiKeyProtected/Dockerfile index 29fe5d33..e87a83b0 100644 --- a/sample-functions/ApiKeyProtected/Dockerfile +++ b/sample-functions/ApiKeyProtected/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.6.9/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.7.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/cobol/Dockerfile b/sample-functions/BaseFunctions/cobol/Dockerfile index 8486e542..f72247f9 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.5.1-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 98e50af9..76d8120b 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.5.1-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 51848e9d..d589a6b5 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.6.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 501f9965..780c811e 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.6.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 10365eda..e4bbb110 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.6.9/fwatchdog.exe /watchdog.exe +ADD https://github.com/openfaas/faas/releases/download/0.7.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 955262ad..4bef57dc 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.5.1-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 b73f04a7..f8053ec2 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.5.1-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 a08d0cf5..8f9c47ad 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.5.1-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index 96f68eef..c86bd4cd 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.6.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 6b7d058b..b547159b 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.6.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 730d355a..79eb029a 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.6.9/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.7.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 4aab6309..bf2baffa 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.6.9/fwatchdog-armhf > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.7.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 83f03580..67245cf9 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.6.9/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 80933a94..36ec9a61 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.6.9/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.7.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.arm64 b/sample-functions/NodeInfo/Dockerfile.arm64 index 8a7dc111..4b0d6fce 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.6.9/fwatchdog-arm64 /usr/bin/fwatchdog +ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog-arm64 /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 989e485a..614939d5 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.5.6-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.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 47a5cd11..ae1405aa 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.5.2-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin 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 6b7c2a0c..f170b345 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.5.1-alpha/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog WORKDIR /root/ diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index e719e17f..c6ac28f9 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.6.9/fwatchdog > /usr/bin/fwatchdog \ + && curl -sL https://github.com/openfaas/faas/releases/download/0.7.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/gif-maker/Dockerfile b/sample-functions/gif-maker/Dockerfile index aa5bdbbb..21651a46 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.5.6-alpha/fwatchdog > /usr/bin/fwatchdog \ + && curl -LS https://github.com/openfaas/faas/releases/download/0.7.0/fwatchdog > /usr/bin/fwatchdog \ && chmod +x /usr/bin/fwatchdog \ && apk del curl WORKDIR /root/ diff --git a/sample-functions/samples.yml b/sample-functions/stack.yml similarity index 98% rename from sample-functions/samples.yml rename to sample-functions/stack.yml index 2ec5fca6..517fb9e9 100644 --- a/sample-functions/samples.yml +++ b/sample-functions/stack.yml @@ -6,7 +6,7 @@ functions: alpinefunction: lang: dockerfile handler: ./AlpineFunction - image: functions/alpine:0.6.9 + image: functions/alpine:latest apikeyprotected: lang: dockerfile