openshift/source-to-image
1
0
Fork 0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00
Code Issues Releases Activity

Fix container build on non-amd64 architectures

Browse Source
This commit is contained in:
Yaakov Selkowitz
2020-06-17 02:54:12 -04:00
parent 49df53861a
commit eb882f4c53
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -8,11 +8,9 @@ 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
@@ -20,9 +18,7 @@ RUN make
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