Move TARGET/BUILD PLATFORM higher in Dockerfiles

This is a partial fix for #232 where "docker build" could not override the two variables for multi-arch builds and caused a user error for building on an arm device. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
openfaas · Dec 2, 2020 · 31d5210 · 31d5210
1 parent 05a3ea5
commit 31d5210
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/template/go/Dockerfile b/template/go/Dockerfile
@@ -1,14 +1,14 @@
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
+
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.13-alpine3.12 as builder
 
 # Required to enable Go modules
 RUN apk add --no-cache git
 
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-ARG TARGETOS
-ARG TARGETARCH
-
 # Allows you to add additional packages via build-arg
 ARG ADDITIONAL_PACKAGE
 ARG CGO_ENABLED=0

diff --git a/template/node/Dockerfile b/template/node/Dockerfile
@@ -1,3 +1,6 @@
+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
 

diff --git a/template/node12/Dockerfile b/template/node12/Dockerfile
@@ -1,3 +1,6 @@
+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
 

diff --git a/template/php7/Dockerfile b/template/php7/Dockerfile
@@ -1,3 +1,6 @@
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
 
 # start with the official Composer image and name it

diff --git a/template/python/Dockerfile b/template/python/Dockerfile
@@ -1,5 +1,7 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
+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
 
 # Allows you to add additional packages via build-arg

diff --git a/template/python3-debian/Dockerfile b/template/python3-debian/Dockerfile
@@ -1,3 +1,6 @@
+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
 

diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile
@@ -1,5 +1,7 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
+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
 
 # Allows you to add additional packages via build-arg

diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile
@@ -1,5 +1,7 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
+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
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog