Merge pull request #1046 from multi-arch/master

Fix multi-arch builds
openshift · Jun 17, 2020 · aca6e1b · aca6e1b
2 parents 49df538 + ac8e27b
commit aca6e1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,21 +8,17 @@ ENV S2I_GIT_VERSION="" \
 WORKDIR /tmp/source-to-image
 COPY . .
 
-ENV GOARCH="amd64"
-
 USER root
 
-RUN make
+RUN make && cp _output/local/bin/linux/$(go env GOARCH)/s2i _output/local/go/bin/s2i
 
 #
 # Runner Image
 #
 
 FROM registry.redhat.io/ubi8/ubi
 
-ENV GOARCH="amd64"
-
-COPY --from=builder /tmp/source-to-image/_output/local/bin/linux/${GOARCH}/s2i  /usr/local/bin/s2i
+COPY --from=builder /tmp/source-to-image/_output/local/go/bin/s2i  /usr/local/bin/s2i
 
 USER 1001
 

diff --git a/hack/common.sh b/hack/common.sh
@@ -33,6 +33,7 @@ readonly S2I_CROSS_COMPILE_PLATFORMS=(
   windows/amd64
   linux/386
   linux/ppc64le
+  linux/s390x
 )
 readonly S2I_CROSS_COMPILE_TARGETS=(
   cmd/s2i