Merge pull request argoproj#2 from rimolive/rmartine-rhds

Remove CPaaS lines from Argo images

rhoai/Dockerfile.argoexec

@@ -12,30 +12,11 @@ FROM registry.redhat.io/ubi8/go-toolset:1.21 as builder
 ARG SOURCE_CODE
 WORKDIR /workspace
 
-## CPaaS CODE BEGIN ##
-COPY ${REMOTE_SOURCE} ${REMOTE_SOURCE_DIR}
-ENV SOURCE_CODE=${REMOTE_SOURCE}/app/
-## CPaaS CODE END ##
-
 USER root
-RUN dnf install -y \
-    git \
-    make \
-    ca-certificates \
-    wget \
-    gcc \
-    bash \
-    mailcap
+RUN dnf install -y mailcap
 
 COPY ${SOURCE_CODE}/go.mod .
 COPY ${SOURCE_CODE}/go.sum .
-
-RUN if [ -z ${CACHITO_ENV_FILE} ]; then \
-       go mod download; \
-    else \
-       source ${CACHITO_ENV_FILE}; \
-    fi
-# Copy the source
 COPY ${SOURCE_CODE}/ ./
 
 RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make dist/argoexec GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE}

rhoai/Dockerfile.workflowcontroller

@@ -13,28 +13,11 @@ FROM registry.redhat.io/ubi8/go-toolset:1.21 as builder
 ARG SOURCE_CODE
 WORKDIR /workspace
 
-## CPaaS CODE BEGIN ##
-COPY ${REMOTE_SOURCE} ${REMOTE_SOURCE_DIR}
-ENV SOURCE_CODE=${REMOTE_SOURCE}/app
-## CPaaS CODE END ##
 USER root
-RUN dnf install -y \
-    git \
-    make \
-    ca-certificates \
-    wget \
-    gcc \
-    bash \
-    mailcap
+RUN dnf install -y mailcap
 
 COPY ${SOURCE_CODE}/go.mod .
 COPY ${SOURCE_CODE}/go.sum .
-RUN if [ -z ${CACHITO_ENV_FILE} ]; then \
-       go mod download; \
-    else \
-       source ${CACHITO_ENV_FILE}; \
-    fi
-# Copy the source
 COPY ${SOURCE_CODE}/ ./
 
 RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make dist/workflow-controller GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE}