Skip to content

Commit

Permalink
Bump the watchdog version to 0.9.6
Browse files Browse the repository at this point in the history
Signed-off-by: Radoslav Dimitrov <[email protected]>
  • Loading branch information
rdimitrov authored and alexellis committed Oct 19, 2018
1 parent 456e4f5 commit 204c0d7
Show file tree
Hide file tree
Showing 33 changed files with 37 additions and 37 deletions.
8 changes: 4 additions & 4 deletions DEV.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess="/go/src/app/app"
Expand All @@ -60,7 +60,7 @@ Update the Docker stack with this:
```
FROM alpine:latest
ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV fprocess="wc"
Expand All @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
```
Expand All @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
```

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/AlpineFunction/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

# Populate example here
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/AlpineFunction/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

# Populate example here
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/AlpineFunction/Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

# Populate example here
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/ApiKeyProtected-Secrets/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER [email protected]
ENTRYPOINT []

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

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/ApiKeyProtected
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/R/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/cobol/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/coffee/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/dncore/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/golang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

ENV fprocess "/go/bin/golang"
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/golang/Dockerfile.win
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog.exe /watchdog.exe
ADD https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog.exe /watchdog.exe

EXPOSE 8080
ENV fprocess="golang.exe"
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/java/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/BaseFunctions/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/CHelloWorld/src/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -SL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk --no-cache del curl

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/CaptainsIntent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/ChangeColorIntent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/DockerHubStats/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER [email protected]
ENTRYPOINT []

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

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/DockerHubStats/Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER [email protected]
ENTRYPOINT []

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

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/HostnameIntent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/MarkdownRender/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER [email protected]
ENTRYPOINT []

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

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/MarkdownRender
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/NodeInfo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/NodeInfo/Dockerfile.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/NodeInfo/Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

COPY package.json .
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/Phantomjs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/ResizeImageMagick/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM v4tech/imagemagick

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

ENV fprocess "convert - -resize 50% fd:1"
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/ResizeImageMagick/Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

ENV fprocess "convert - -resize 50% fd:1"
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/SentimentAnalysis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

WORKDIR /root/
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/SentimentAnalysis/Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -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.4/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down
2 changes: 1 addition & 1 deletion sample-functions/WebhookStash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER [email protected]
ENTRYPOINT []

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

WORKDIR /go/src/github.com/openfaas/faas/sample-functions/WebhookStash
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/figlet/Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog

RUN apk add --no-cache figlet
Expand Down
2 changes: 1 addition & 1 deletion sample-functions/gif-maker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -LS https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl
WORKDIR /root/
Expand Down
4 changes: 2 additions & 2 deletions watchdog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Example Dockerfile for an `echo` function:
```
FROM alpine:3.8
ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
# Define your binary here
Expand All @@ -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.4/fwatchdog > /usr/bin/fwatchdog \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.6/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
```

Expand Down

0 comments on commit 204c0d7

Please sign in to comment.