Merge pull request #189 from AjayJagan/konflux-dockerfile-update

(feat): Update dockerfile to support multi-arch builds

Author: openshift-merge-bot[bot]

backend/Dockerfile

@@ -36,6 +36,9 @@ RUN GO111MODULE=on CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime go build -tags s
 
 # 2. Compile preloaded pipeline samples
 FROM registry.access.redhat.com/ubi9/python-39:9.5 AS compiler
+
+ARG TARGETOS TARGETARCH
+
 USER root
 RUN dnf install -y python3-setuptools jq
 RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py
@@ -44,10 +47,10 @@ RUN python3 -m pip install -r requirements.txt --no-cache-dir
 
 # Downloading Argo CLI so that the samples are validated
 ENV ARGO_VERSION=v3.5.14
-RUN curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-linux-amd64.gz && \
-    gunzip argo-linux-amd64.gz && \
-    chmod +x argo-linux-amd64 && \
-    mv ./argo-linux-amd64 /usr/local/bin/argo
+RUN curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-${TARGETOS:-linux}-${TARGETARCH:-amd64}.gz && \
+    gunzip argo-${TARGETOS:-linux}-${TARGETARCH:-amd64}.gz && \
+    chmod +x argo-${TARGETOS:-linux}-${TARGETARCH:-amd64} && \
+    mv ./argo-${TARGETOS:-linux}-${TARGETARCH:-amd64} /usr/local/bin/argo
 
 WORKDIR /
 COPY ./samples /samples

backend/Dockerfile.driver

@@ -20,6 +20,7 @@ FROM registry.access.redhat.com/ubi9/go-toolset:1.23 AS builder
 
 ## Build args to be used at this step
 ARG SOURCE_CODE
+ARG TARGETARCH
 
 ## Switch to root as required for some operations
 USER root
@@ -34,7 +35,7 @@ RUN GO111MODULE=on go mod download
 # Copy the source
 COPY ${SOURCE_CODE}/ ./
 
-RUN GO111MODULE=on CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GOEXPERIMENT=strictfipsruntime go build -tags 'netgo strictfipsruntime' -o /bin/driver ./backend/src/v2/cmd/driver/*.go
+RUN GO111MODULE=on CGO_ENABLED=1 GOOS=linux GOARCH=${TARGETARCH:-amd64} GOEXPERIMENT=strictfipsruntime go build -tags 'netgo strictfipsruntime' -o /bin/driver ./backend/src/v2/cmd/driver/*.go
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
 

backend/Dockerfile.launcher

@@ -22,6 +22,7 @@ FROM registry.access.redhat.com/ubi9/go-toolset:1.23 AS builder
 
 ## Build args to be used at this step
 ARG SOURCE_CODE
+ARG TARGETARCH
 
 ## Switch to root as required for some operations
 USER root
@@ -36,8 +37,8 @@ RUN GO111MODULE=on go mod download
 # Copy the source
 COPY ${SOURCE_CODE}/ ./
 
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/launcher-v2 ./backend/src/v2/cmd/launcher-v2/*.go
-RUN GO111MODULE=on CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GOEXPERIMENT=strictfipsruntime go build -tags 'netgo strictfipsruntime' -o /bin/launcher-v2-fips ./backend/src/v2/cmd/launcher-v2/*.go
+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH:-amd64} go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/launcher-v2 ./backend/src/v2/cmd/launcher-v2/*.go
+RUN GO111MODULE=on CGO_ENABLED=1 GOOS=linux GOARCH=${TARGETARCH:-amd64} GOEXPERIMENT=strictfipsruntime go build -tags 'netgo strictfipsruntime' -o /bin/launcher-v2-fips ./backend/src/v2/cmd/launcher-v2/*.go
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5