Switch to multi-arch image to pull images

Signed-off-by: Alex Ellis <alexellis2@gmail.com>
openfaas · Jun 6, 2019 · f016955 · f016955
1 parent 77ee581
commit f016955
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/template/python27-flask/Dockerfile b/template/python27-flask/Dockerfile
@@ -1,11 +1,12 @@
+FROM openfaas/of-watchdog:0.5.3 as watchdog
 FROM python:2.7-alpine
 
+COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
+RUN chmod +x /usr/bin/fwatchdog
+
+ARG ADDITIONAL_PACKAGE
 # 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 > /usr/bin/fwatchdog \
-    && chmod +x /usr/bin/fwatchdog \
-    && apk del curl --no-cache
+RUN apk --no-cache add ${ADDITIONAL_PACKAGE}
 
 WORKDIR /root/
 

diff --git a/template/python3-flask/Dockerfile b/template/python3-flask/Dockerfile
@@ -1,13 +1,11 @@
+FROM openfaas/of-watchdog:0.5.3 as watchdog
 FROM python:3.7-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 > /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
 
-RUN apk --no-cache add musl-dev gcc make
+ARG ADDITIONAL_PACKAGE
+RUN apk --no-cache add musl-dev gcc make ${ADDITIONAL_PACKAGE}
 
 WORKDIR /root/
 

diff --git a/template/python3-http/Dockerfile b/template/python3-http/Dockerfile
@@ -1,12 +1,12 @@
-FROM python:3.6-alpine
+FROM openfaas/of-watchdog:0.5.3 as watchdog
+FROM python:3.7-alpine
+
+COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
+RUN chmod +x /usr/bin/fwatchdog
 
 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 > /usr/bin/fwatchdog \
-    && chmod +x /usr/bin/fwatchdog \
-    && apk del curl --no-cache
+RUN apk --no-cache add ${ADDITIONAL_PACKAGE}
 
 # Add non root user
 RUN addgroup -S app && adduser app -S -G app