Sample-functions: Get watchdog using curl instead of ADD - amd64

Convert all sample-functions to use curl to get the watchdog as
it can be cached by Docker. Issue #841

Signed-off-by: Radoslav Dimitrov <rdimitrow@gmail.com>
This commit is contained in:
Radoslav Dimitrov 2018-09-02 20:10:59 +03:00 committed by Alex Ellis
parent 817aae34a2
commit cdbd25c0fb
17 changed files with 54 additions and 38 deletions

View File

@ -1,9 +1,8 @@
FROM alpine:3.7 FROM alpine:3.7
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
&& curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
# COPY ./fwatchdog /usr/bin/ && chmod +x /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog
# Populate example here # Populate example here
# ENV fprocess="wc -l" # ENV fprocess="wc -l"

View File

@ -1,7 +1,8 @@
FROM artemklevtsov/r-alpine:latest FROM artemklevtsov/r-alpine:latest
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/ WORKDIR /root/

View File

@ -1,7 +1,9 @@
FROM toricls/gnucobol:latest FROM toricls/gnucobol:latest
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apt-get update && apt-get install -y curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
WORKDIR /root/ WORKDIR /root/

View File

@ -1,7 +1,8 @@
FROM node:6.9.1-alpine FROM node:6.9.1-alpine
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/ WORKDIR /root/

View File

@ -1,7 +1,9 @@
FROM microsoft/dotnet:sdk FROM microsoft/dotnet:sdk
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apt-get update && apt-get install -y curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1

View File

@ -8,8 +8,9 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/golang
RUN go install RUN go install
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
ENV fprocess "/go/bin/golang" ENV fprocess "/go/bin/golang"
HEALTHCHECK --interval=1s CMD [ -e /tmp/.lock ] || exit 1 HEALTHCHECK --interval=1s CMD [ -e /tmp/.lock ] || exit 1

View File

@ -1,7 +1,8 @@
FROM openjdk:8u121-jdk-alpine FROM openjdk:8u121-jdk-alpine
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/ WORKDIR /root/

View File

@ -1,8 +1,8 @@
FROM node:6.9.1-alpine FROM node:6.9.1-alpine
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/ WORKDIR /root/
COPY package.json . COPY package.json .

View File

@ -1,7 +1,8 @@
FROM python:2.7-alpine FROM python:2.7-alpine
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/ WORKDIR /root/

View File

@ -1,8 +1,9 @@
FROM alpine:3.7 FROM alpine:3.7
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
COPY package.json . COPY package.json .
COPY handler.js . COPY handler.js .

View File

@ -1,9 +1,9 @@
FROM alpine:3.7 FROM alpine:3.7
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
#COPY ./fwatchdog /usr/bin/ && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
RUN chmod +x /usr/bin/fwatchdog && chmod +x /usr/bin/fwatchdog
COPY package.json . COPY package.json .
RUN npm i RUN npm i

View File

@ -1,8 +1,9 @@
FROM alpine:3.7 FROM alpine:3.7
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
COPY package.json . COPY package.json .
COPY handler.js . COPY handler.js .

View File

@ -2,8 +2,9 @@ FROM alpine:3.7
RUN apk --update add nodejs nodejs-npm RUN apk --update add nodejs nodejs-npm
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
COPY package.json . COPY package.json .
COPY main.js . COPY main.js .

View File

@ -1,7 +1,9 @@
FROM alexellis2/phantomjs-docker:latest FROM alexellis2/phantomjs-docker:latest
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apt-get update && apt-get install -y curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV fprocess="phantomjs /dev/stdin" ENV fprocess="phantomjs /dev/stdin"

View File

@ -1,7 +1,8 @@
FROM v4tech/imagemagick FROM v4tech/imagemagick
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
ENV fprocess "convert - -resize 50% fd:1" ENV fprocess "convert - -resize 50% fd:1"

View File

@ -3,8 +3,9 @@ FROM python:2.7-alpine
RUN pip install textblob && \ RUN pip install textblob && \
python -m textblob.download_corpora python -m textblob.download_corpora
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
WORKDIR /root/ WORKDIR /root/

View File

@ -1,7 +1,8 @@
FROM alpine:3.7 FROM alpine:3.7
ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin RUN apk --no-cache add curl \
RUN chmod +x /usr/bin/fwatchdog && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
RUN apk add --no-cache figlet RUN apk add --no-cache figlet