fix: set default values for architectures (#209)

* fix: set default values for architectures * fix: set default values
elastic · Jun 3, 2022 · a98000c · a98000c
1 parent 831fe5e
commit a98000c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/go/arm/Dockerfile.tmpl b/go/arm/Dockerfile.tmpl
@@ -91,10 +91,8 @@ RUN apt install -y \
         libsystemd-dev
 {{- end }}
 
-
-
 # Declare TARGETARCH to make it available
-ARG TARGETARCH
+ARG TARGETARCH=amd64
 # Select final stage based on TARGETARCH ARG
 FROM stage-${TARGETARCH} as final
 

diff --git a/go/darwin-arm64/Dockerfile.tmpl b/go/darwin-arm64/Dockerfile.tmpl
@@ -5,8 +5,8 @@ ARG TAG_EXTENSION=''
 FROM --platform=linux/amd64  docker.elastic.co/beats-dev/golang-crossbuild:llvm-apple-debian{{ .DEBIAN_VERSION }}-amd64 AS build-llvm-apple-amd64
 FROM --platform=linux/arm64  docker.elastic.co/beats-dev/golang-crossbuild:llvm-apple-debian{{ .DEBIAN_VERSION }}-arm64 AS build-llvm-apple-arm64
 # workaround to https://github.com/moby/moby/issues/34482
-ARG TARGETARCH
-ARG BUILDARCH
+ARG TARGETARCH=amd64
+ARG BUILDARCH=amd64
 FROM build-llvm-apple-${TARGETARCH} as build-llvm-apple
 ARG TARGETARCH
 ARG BUILDARCH

diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
@@ -6,8 +6,8 @@ ARG TAG_EXTENSION=''
 FROM --platform=linux/amd64  docker.elastic.co/beats-dev/golang-crossbuild:llvm-apple-debian{{ .DEBIAN_VERSION }}-amd64 AS build-llvm-apple-amd64
 FROM --platform=linux/arm64  docker.elastic.co/beats-dev/golang-crossbuild:llvm-apple-debian{{ .DEBIAN_VERSION }}-arm64 AS build-llvm-apple-arm64
 # workaround to https://github.com/moby/moby/issues/34482
-ARG TARGETARCH
-ARG BUILDARCH
+ARG TARGETARCH=amd64
+ARG BUILDARCH=amd64
 FROM build-llvm-apple-${TARGETARCH} as build-llvm-apple
 ARG TARGETARCH
 ARG BUILDARCH