From 19e7f4639e460434b197d945c99910f875219d1e Mon Sep 17 00:00:00 2001 From: John McCabe Date: Sun, 25 Feb 2018 00:03:42 +0000 Subject: [PATCH] Complete bump to 0.7.1 watchdog and repo. Also bumps golang builder version to 1.9.4 for sample functions. Signed-off-by: John McCabe --- DEV.md | 6 +++--- guide/deployment_digitalocean.md | 2 +- guide/deployment_swarm_arm.md | 2 +- sample-functions/ApiKeyProtected-Secrets/Dockerfile | 2 +- sample-functions/ApiKeyProtected/Dockerfile | 2 +- sample-functions/BaseFunctions/R/Dockerfile | 2 +- sample-functions/BaseFunctions/golang/Dockerfile | 2 +- sample-functions/BaseFunctions/golang/Dockerfile.win | 2 +- sample-functions/CHelloWorld/src/Dockerfile | 2 +- sample-functions/DockerHubStats/Dockerfile | 2 +- sample-functions/DockerHubStats/Dockerfile.armhf | 2 +- sample-functions/MarkdownRender/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile.armhf | 2 +- sample-functions/ResizeImageMagick/Dockerfile.armhf | 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/stack.yml | 5 ++++- watchdog/README.md | 2 +- 21 files changed, 26 insertions(+), 23 deletions(-) diff --git a/DEV.md b/DEV.md index 4074c222..19392752 100644 --- a/DEV.md +++ b/DEV.md @@ -26,7 +26,7 @@ You can find the [reference documentation for the Watchdog here](https://github. This is the basis of a function which generates HTML from MarkDown: ``` -FROM golang:1.7.5 +FROM golang:1.9.4 RUN mkdir -p /go/src/app COPY handler.go /go/src/app WORKDIR /go/src/app @@ -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/v0.3-alpha/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/src/app/app" @@ -61,7 +61,7 @@ Update the Docker stack with this: ``` FROM alpine:latest -ADD https://github.com/openfaas/faas/releases/download/v0.3-alpha/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="wc" diff --git a/guide/deployment_digitalocean.md b/guide/deployment_digitalocean.md index 5cb703e9..6133e879 100644 --- a/guide/deployment_digitalocean.md +++ b/guide/deployment_digitalocean.md @@ -106,7 +106,7 @@ This command clones the OpenFaaS Github repository then checkouts out a stable r ``` $ git clone https://github.com/alexellis/faas && \ cd faas && \ - git checkout 0.6.5 && \ + git checkout 0.7.1 && \ ./deploy_stack.sh ``` diff --git a/guide/deployment_swarm_arm.md b/guide/deployment_swarm_arm.md index 74beaf11..d355eba5 100644 --- a/guide/deployment_swarm_arm.md +++ b/guide/deployment_swarm_arm.md @@ -53,7 +53,7 @@ Clone OpenFaaS and then checkout the latest stable release: ```sh $ git clone https://github.com/openfaas/faas && \ cd faas && \ - git checkout 0.6.5 && \ + git checkout 0.7.1 && \ ./deploy_stack.armhf.sh ``` diff --git a/sample-functions/ApiKeyProtected-Secrets/Dockerfile b/sample-functions/ApiKeyProtected-Secrets/Dockerfile index f998e750..6be5d49d 100644 --- a/sample-functions/ApiKeyProtected-Secrets/Dockerfile +++ b/sample-functions/ApiKeyProtected-Secrets/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine as builder +FROM golang:1.9.4-alpine as builder MAINTAINER alex@openfaas.com ENTRYPOINT [] diff --git a/sample-functions/ApiKeyProtected/Dockerfile b/sample-functions/ApiKeyProtected/Dockerfile index f998e750..6be5d49d 100644 --- a/sample-functions/ApiKeyProtected/Dockerfile +++ b/sample-functions/ApiKeyProtected/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine as builder +FROM golang:1.9.4-alpine as builder MAINTAINER alex@openfaas.com ENTRYPOINT [] diff --git a/sample-functions/BaseFunctions/R/Dockerfile b/sample-functions/BaseFunctions/R/Dockerfile index dd52ee49..4d8c3317 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.6.1/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/ diff --git a/sample-functions/BaseFunctions/golang/Dockerfile b/sample-functions/BaseFunctions/golang/Dockerfile index c5ae21c6..ff064cff 100644 --- a/sample-functions/BaseFunctions/golang/Dockerfile +++ b/sample-functions/BaseFunctions/golang/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.5-alpine +FROM golang:1.9.4-alpine MAINTAINER alexellis2@gmail.com ENTRYPOINT [] diff --git a/sample-functions/BaseFunctions/golang/Dockerfile.win b/sample-functions/BaseFunctions/golang/Dockerfile.win index 11581c6a..f8215424 100644 --- a/sample-functions/BaseFunctions/golang/Dockerfile.win +++ b/sample-functions/BaseFunctions/golang/Dockerfile.win @@ -1,4 +1,4 @@ -FROM golang:1.7.5-windowsservercore +FROM golang:1.9.4-windowsservercore MAINTAINER alexellis2@gmail.com ENTRYPOINT [] diff --git a/sample-functions/CHelloWorld/src/Dockerfile b/sample-functions/CHelloWorld/src/Dockerfile index f9055c89..c7fd5561 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.6.4/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 \ && apk --no-cache del curl diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index 869c76f9..bb9fd39e 100644 --- a/sample-functions/DockerHubStats/Dockerfile +++ b/sample-functions/DockerHubStats/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine as builder +FROM golang:1.9.4-alpine as builder MAINTAINER alex@openfaas.com ENTRYPOINT [] diff --git a/sample-functions/DockerHubStats/Dockerfile.armhf b/sample-functions/DockerHubStats/Dockerfile.armhf index 37b41d94..d60bb413 100644 --- a/sample-functions/DockerHubStats/Dockerfile.armhf +++ b/sample-functions/DockerHubStats/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine as builder +FROM golang:1.9.4-alpine as builder MAINTAINER alex@openfaas.com ENTRYPOINT [] diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile index 3468a70c..42ff6411 100644 --- a/sample-functions/MarkdownRender/Dockerfile +++ b/sample-functions/MarkdownRender/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine as builder +FROM golang:1.9.4-alpine as builder MAINTAINER alex@openfaas.com ENTRYPOINT [] diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index fcd8932e..64ccd73f 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.6.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 . diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf index 352dcd41..2da6454f 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.6.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 COPY package.json . diff --git a/sample-functions/ResizeImageMagick/Dockerfile.armhf b/sample-functions/ResizeImageMagick/Dockerfile.armhf index 009d28bd..fc1d5314 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.6.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 ENV fprocess "convert - -resize 50% fd:1" diff --git a/sample-functions/SentimentAnalysis/Dockerfile.armhf b/sample-functions/SentimentAnalysis/Dockerfile.armhf index 1b88f42c..04d6a1b9 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.6.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 WORKDIR /root/ diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index b411313a..ffa708d1 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine as builder +FROM golang:1.9.4-alpine as builder MAINTAINER alex@openfaas.com ENTRYPOINT [] diff --git a/sample-functions/figlet/Dockerfile b/sample-functions/figlet/Dockerfile index 4124874f..aedb65a0 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.6.15/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.1/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 1bc67cd0..25d95a93 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.6.15/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 RUN apk add --no-cache figlet diff --git a/sample-functions/stack.yml b/sample-functions/stack.yml index 517fb9e9..6333f5e9 100644 --- a/sample-functions/stack.yml +++ b/sample-functions/stack.yml @@ -41,7 +41,10 @@ functions: gif-maker: lang: dockerfile handler: ./gif-maker - image: functions/gif-maker:latest + image: functions/gif-maker:dev + environment: + read_timeout: 60 + write_timeout: 60 hostnameintent: lang: dockerfile diff --git a/watchdog/README.md b/watchdog/README.md index 73f1a648..2dec040c 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.6.15/fwatchdog /usr/bin +ADD https://github.com/openfaas/faas/releases/download/0.7.1/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog # Define your binary here