mirror of
https://github.com/openfaas/faas.git
synced 2025-06-08 08:25:03 +00:00
Bump watchdog to 0.9.4
Bumping the watchdog to 0.9.4 in mentioned places Signed-off-by: Martin Dekov (VMware) <mdekov@vmware.com>
This commit is contained in:
parent
4476a65dac
commit
4d73e21906
8
DEV.md
8
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.9.0/fwatchdog /usr/bin
|
||||
ADD https://github.com/openfaas/faas/releases/download/0.9.4/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.9.0/fwatchdog /usr/bin
|
||||
ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin
|
||||
RUN chmod +x /usr/bin/fwatchdog
|
||||
|
||||
ENV fprocess="wc"
|
||||
@ -86,14 +86,14 @@ You can optimize Docker to cache getting the watchdog by using curl, instead of
|
||||
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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
```
|
||||
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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
```
|
||||
|
||||
|
@ -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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
# Populate example here
|
||||
|
@ -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.0/fwatchdog-arm64 > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-arm64 > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
# Populate example here
|
||||
|
@ -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.0/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.8.0/fwatchdog.exe /watchdog.exe
|
||||
ADD https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
WORKDIR /root/
|
||||
|
@ -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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -SL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog \
|
||||
&& apk --no-cache del curl
|
||||
|
||||
|
@ -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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
COPY package.json .
|
||||
|
@ -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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
COPY package.json .
|
||||
|
@ -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.0/fwatchdog-arm64 > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-arm64 > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
COPY package.json .
|
||||
|
@ -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.0/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
ENV fprocess "convert - -resize 50% fd:1"
|
||||
|
@ -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.0/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/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.7
|
||||
|
||||
RUN apk --no-cache add curl \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
RUN apk add --no-cache figlet
|
||||
|
@ -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.0/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog-armhf > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
|
||||
RUN apk add --no-cache figlet
|
||||
|
@ -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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -LS https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog \
|
||||
&& apk del curl
|
||||
WORKDIR /root/
|
||||
|
@ -36,7 +36,7 @@ Example Dockerfile for an `echo` function:
|
||||
```
|
||||
FROM alpine:3.7
|
||||
|
||||
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
|
||||
ADD https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog /usr/bin
|
||||
RUN chmod +x /usr/bin/fwatchdog
|
||||
|
||||
# Define your binary here
|
||||
@ -50,7 +50,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.0/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.4/fwatchdog > /usr/bin/fwatchdog \
|
||||
&& chmod +x /usr/bin/fwatchdog
|
||||
```
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user