Revert ordering of PLATFORM args

When the args are after the first FROM, then buildx fails to work. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
openfaas · Dec 4, 2020 · 670d3df · 670d3df
1 parent b40bcf4
commit 670d3df
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/template/node/Dockerfile b/template/node/Dockerfile
@@ -1,9 +1,9 @@
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12-alpine as ship
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 

diff --git a/template/node12/Dockerfile b/template/node12/Dockerfile
@@ -1,9 +1,9 @@
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/of-watchdog:0.7.2 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12-alpine as ship
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 

diff --git a/template/python/Dockerfile b/template/python/Dockerfile
@@ -1,9 +1,9 @@
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7-alpine
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 # Allows you to add additional packages via build-arg
 ARG ADDITIONAL_PACKAGE
 

diff --git a/template/python3-debian/Dockerfile b/template/python3-debian/Dockerfile
@@ -1,9 +1,9 @@
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 # Allows you to add additional packages via build-arg
 ARG ADDITIONAL_PACKAGE
 

diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile
@@ -1,9 +1,9 @@
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3-alpine
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 # Allows you to add additional packages via build-arg
 ARG ADDITIONAL_PACKAGE
 

diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile
@@ -1,9 +1,9 @@
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog