Update arm templates to use multi-arch watchdog

Signed-off-by: Burton Rheutan <rheutan7@gmail.com>
openfaas · Jun 7, 2019 · 7e93737 · 7e93737
1 parent ccf3ba6
commit 7e93737
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/template/python3-flask-armhf/Dockerfile b/template/python3-flask-armhf/Dockerfile
@@ -1,11 +1,10 @@
+FROM openfaas/of-watchdog:0.5.3 as watchdog
 FROM armhf/python:3.6-alpine
 
-# Alternatively use ADD https:// (which will not be cached by Docker builder)
-RUN apk --no-cache add curl \
-    && echo "Pulling watchdog binary from Github." \
-    && curl -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.5.0/of-watchdog-armhf > /usr/bin/fwatchdog \
-    && chmod +x /usr/bin/fwatchdog \
-    && apk del curl --no-cache
+ARG ADDITIONAL_PACKAGE
+
+COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
+RUN chmod +x /usr/bin/fwatchdog
 
 RUN apk --no-cache add musl-dev gcc make openssl-dev libffi-dev
 

diff --git a/template/python3-http-armhf/Dockerfile b/template/python3-http-armhf/Dockerfile
@@ -1,12 +1,10 @@
+FROM openfaas/of-watchdog:0.5.3 as watchdog
 FROM armhf/python:3.6-alpine
 
 ARG ADDITIONAL_PACKAGE
-# Alternatively use ADD https:// (which will not be cached by Docker builder)
-RUN apk --no-cache add curl ${ADDITIONAL_PACKAGE} \
-    && echo "Pulling watchdog binary from Github." \
-    && curl -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.4.6/of-watchdog-armhf > /usr/bin/fwatchdog \
-    && chmod +x /usr/bin/fwatchdog \
-    && apk del curl --no-cache
+
+COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
+RUN chmod +x /usr/bin/fwatchdog
 
 # Add non root user
 RUN addgroup -S app && adduser app -S -G app