faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-08 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Complete bump to 0.7.1 watchdog and repo.

Browse Source 
Also bumps golang builder version to 1.9.4 for sample functions.

Signed-off-by: John McCabe <john@johnmccabe.net>
This commit is contained in:
John McCabe 2018-02-25 00:03:42 +00:00 committed by Alex Ellis
parent 4e9d999554
commit 19e7f4639e
21 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEV.md
View File

@ -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"

2
guide/deployment_digitalocean.md
View File

@ -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
```

2
guide/deployment_swarm_arm.md
View File

@ -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
```

2
sample-functions/ApiKeyProtected-Secrets/Dockerfile
View File

@ -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 []

2
sample-functions/ApiKeyProtected/Dockerfile
View File

@ -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 []

2
sample-functions/BaseFunctions/R/Dockerfile
View File

@ -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/

2
sample-functions/BaseFunctions/golang/Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.7.5-alpine
FROM golang:1.9.4-alpine
MAINTAINER alexellis2@gmail.com
ENTRYPOINT []

2
sample-functions/BaseFunctions/golang/Dockerfile.win
View File

@ -1,4 +1,4 @@
FROM golang:1.7.5-windowsservercore
FROM golang:1.9.4-windowsservercore
MAINTAINER alexellis2@gmail.com
ENTRYPOINT []

2
sample-functions/CHelloWorld/src/Dockerfile
View File

@ -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

2
sample-functions/DockerHubStats/Dockerfile
View File

@ -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 []

2
sample-functions/DockerHubStats/Dockerfile.armhf
View File

@ -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 []

2
sample-functions/MarkdownRender/Dockerfile
View File

@ -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 []

2
sample-functions/NodeInfo/Dockerfile
View File

@ -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 .

2
sample-functions/NodeInfo/Dockerfile.armhf
View File

@ -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 .

2
sample-functions/ResizeImageMagick/Dockerfile.armhf
View File

@ -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"

2
sample-functions/SentimentAnalysis/Dockerfile.armhf
View File

@ -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/

2
sample-functions/WebhookStash/Dockerfile
View File

@ -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 []

2
sample-functions/figlet/Dockerfile
View File

@ -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

2
sample-functions/figlet/Dockerfile.armhf
View File

@ -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

5
sample-functions/stack.yml
View File

@ -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

2
watchdog/README.md
View File

@ -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