Permalink
Browse files

Update watchdog to 0.9.14 for sample functions

We need to update the watchdog version for sample functions to 0.9.14
including all references in markdown files.

Signed-off-by: Ron Rivera <roncrivera@gmail.com>
  • Loading branch information...
roncrivera authored and alexellis committed Jan 13, 2019
1 parent 526d35e commit 33800a20d8285a30472af04c6e7473a0ba8612d8
Showing with 37 additions and 37 deletions.
  1. +4 −4 DEV.md
  2. +1 −1 sample-functions/AlpineFunction/Dockerfile.arm64
  3. +1 −1 sample-functions/AlpineFunction/Dockerfile.armhf
  4. +1 −1 sample-functions/ApiKeyProtected-Secrets/Dockerfile
  5. +1 −1 sample-functions/BaseFunctions/R/Dockerfile
  6. +1 −1 sample-functions/BaseFunctions/cobol/Dockerfile
  7. +1 −1 sample-functions/BaseFunctions/coffee/Dockerfile
  8. +1 −1 sample-functions/BaseFunctions/dncore/Dockerfile
  9. +1 −1 sample-functions/BaseFunctions/golang/Dockerfile
  10. +1 −1 sample-functions/BaseFunctions/golang/Dockerfile.win
  11. +1 −1 sample-functions/BaseFunctions/java/Dockerfile
  12. +1 −1 sample-functions/BaseFunctions/node/Dockerfile
  13. +1 −1 sample-functions/BaseFunctions/python/Dockerfile
  14. +1 −1 sample-functions/CHelloWorld/src/Dockerfile
  15. +1 −1 sample-functions/CaptainsIntent/Dockerfile
  16. +1 −1 sample-functions/ChangeColorIntent/Dockerfile
  17. +1 −1 sample-functions/DockerHubStats/Dockerfile
  18. +1 −1 sample-functions/DockerHubStats/Dockerfile.armhf
  19. +1 −1 sample-functions/HostnameIntent/Dockerfile
  20. +1 −1 sample-functions/MarkdownRender/Dockerfile
  21. +1 −1 sample-functions/NodeInfo/Dockerfile
  22. +1 −1 sample-functions/NodeInfo/Dockerfile.arm64
  23. +1 −1 sample-functions/NodeInfo/Dockerfile.armhf
  24. +1 −1 sample-functions/Phantomjs/Dockerfile
  25. +1 −1 sample-functions/ResizeImageMagick/Dockerfile
  26. +1 −1 sample-functions/ResizeImageMagick/Dockerfile.armhf
  27. +1 −1 sample-functions/SentimentAnalysis/Dockerfile
  28. +1 −1 sample-functions/SentimentAnalysis/Dockerfile.armhf
  29. +1 −1 sample-functions/WebhookStash/Dockerfile
  30. +1 −1 sample-functions/figlet/Dockerfile
  31. +1 −1 sample-functions/figlet/Dockerfile.armhf
  32. +1 −1 sample-functions/gif-maker/Dockerfile
  33. +2 −2 watchdog/README.md
8 DEV.md
@@ -34,7 +34,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.6/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess="/go/src/app/app"
@@ -60,7 +60,7 @@ Update the Docker stack with this:
```
FROM alpine:latest
ADD https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess="wc"
@@ -87,7 +87,7 @@ 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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
```
@@ -96,7 +96,7 @@ 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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
```

@@ -1,7 +1,7 @@
FROM alpine:3.8

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

# Populate example here
@@ -1,7 +1,7 @@
FROM alpine:3.8

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-armhf > /usr/bin/fwatchdog \
&& 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.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/ApiKeyProtected
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& 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.9.6/fwatchdog.exe /watchdog.exe
ADD https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog.exe /watchdog.exe

EXPOSE 8080
ENV fprocess="golang.exe"
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/

@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
@@ -1,6 +1,6 @@
FROM alpine:3.8 as builder
RUN apk add --no-cache curl \
&& curl -SL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -SL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk --no-cache del curl

@@ -2,7 +2,7 @@ FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
@@ -2,7 +2,7 @@ FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& 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.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/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.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
@@ -2,7 +2,7 @@ FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& 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.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/MarkdownRender
@@ -3,7 +3,7 @@ FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
@@ -3,7 +3,7 @@ FROM alpine:3.8
RUN apk --update add nodejs nodejs-npm

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
@@ -2,7 +2,7 @@ FROM alpine:3.8
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.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

@@ -1,7 +1,7 @@
FROM v4tech/imagemagick

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

ENV fprocess "convert - -resize 50% fd:1"
@@ -3,7 +3,7 @@ FROM arm32v6/alpine:3.8
RUN apk --no-cache add imagemagick

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

ENV fprocess "convert - -resize 50% fd:1"
@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
@@ -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.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

@@ -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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/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.8

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

RUN apk add --no-cache figlet
@@ -1,7 +1,7 @@
FROM alpine:3.8

RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

RUN apk add --no-cache figlet
@@ -1,7 +1,7 @@
FROM alpine:3.8

RUN apk --no-cache add ffmpeg gifsicle curl \
&& curl -LS https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -LS https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl
WORKDIR /root/
@@ -40,7 +40,7 @@ Example Dockerfile for an `echo` function:
```
FROM alpine:3.8
ADD https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
# Define your binary here
@@ -54,7 +54,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.6/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.14/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
```

0 comments on commit 33800a2

Please sign in to comment.