From ab4d95c4d880d615ab693d65f88731e59ba76e7a Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Tue, 25 Jun 2019 21:22:26 +0100 Subject: [PATCH] Update figlet's watchdog Signed-off-by: Alex Ellis --- sample-functions/figlet/Dockerfile | 9 +++++---- sample-functions/figlet/Dockerfile.armhf | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sample-functions/figlet/Dockerfile b/sample-functions/figlet/Dockerfile index fd4c1406..90879d91 100644 --- a/sample-functions/figlet/Dockerfile +++ b/sample-functions/figlet/Dockerfile @@ -1,8 +1,9 @@ -FROM alpine:3.8 +FROM openfaas/classic-watchdog:0.14.4 as watchdog -RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.13.0/fwatchdog > /usr/bin/fwatchdog \ - && chmod +x /usr/bin/fwatchdog +FROM alpine:3.9 + +COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog +RUN chmod +x /usr/bin/fwatchdog RUN apk add --no-cache figlet diff --git a/sample-functions/figlet/Dockerfile.armhf b/sample-functions/figlet/Dockerfile.armhf index f339ef86..90879d91 100644 --- a/sample-functions/figlet/Dockerfile.armhf +++ b/sample-functions/figlet/Dockerfile.armhf @@ -1,8 +1,9 @@ -FROM alpine:3.8 +FROM openfaas/classic-watchdog:0.14.4 as watchdog -RUN apk --no-cache add curl \ - && curl -sL https://github.com/openfaas/faas/releases/download/0.13.0/fwatchdog-armhf > /usr/bin/fwatchdog \ - && chmod +x /usr/bin/fwatchdog +FROM alpine:3.9 + +COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog +RUN chmod +x /usr/bin/fwatchdog RUN apk add --no-cache figlet @@ -11,3 +12,4 @@ ENV fprocess="figlet" HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1 CMD ["fwatchdog"] +