break up big run command

Author: dminnear-rh

.github/workflows/docker-publish.yml

@@ -6,6 +6,8 @@ on:
   push:
     branches: ['main']
     tags: ['v*.*.*']
+  pull_request:
+    branches: ['main']
 
 env:
   REGISTRY: quay.io
@@ -75,7 +77,7 @@ jobs:
           context: .
           file: Containerfile
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

Containerfile

@@ -64,24 +64,43 @@ RUN microdnf --disableplugin=subscription-manager install -y make git-core tar v
 microdnf remove -y $DNF_TO_REMOVE && \
 rpm -e --nodeps $RPM_TO_FORCEFULLY_REMOVE && \
 microdnf clean all && \
-rm -rf /var/cache/dnf && \
+rm -rf /var/cache/dnf
+
+# Download ArgoCD CLI
+RUN echo "Downloading ArgoCD for ${TARGETARCH}..." && \
 curl -sfL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-${TARGETARCH} && \
-chmod +x /usr/local/bin/argocd && \
+chmod +x /usr/local/bin/argocd
+
+# Download Helm
+RUN echo "Downloading Helm for ${TARGETARCH}..." && \
 curl -sLfO https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
 tar xf helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz --strip-component 1 -C /usr/local/bin && \
 chmod +x /usr/local/bin/helm && rm -f /usr/local/bin/README.md && rm -f /usr/local/bin/LICENSE && \
-rm -f helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
+rm -f helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
+
+# Download Tekton CLI
+RUN echo "Downloading Tekton CLI for ${ALTTARGETARCH}..." && \
 curl -sLfO https://github.com/tektoncd/cli/releases/download/v${TKN_CLI_VERSION}/tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz && \
 tar xf tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz -C /usr/local/bin --no-same-owner && chmod 755 /usr/local/bin/tkn && \
 rm -f tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz && \
-rm -f /usr/local/bin/README.md && rm -f /usr/local/bin/LICENSE && \
+rm -f /usr/local/bin/README.md && rm -f /usr/local/bin/LICENSE
+
+# Download Hypershift CLI
+RUN echo "Downloading Hypershift CLI from ${HYPERSHIFT_URL}..." && \
 curl -skLf -o hcp.tar.gz ${HYPERSHIFT_URL} && \
 tar xf hcp.tar.gz -C /usr/local/bin/ && \
-rm -f hcp.tar.gz && \
+rm -f hcp.tar.gz
+
+# Download OpenShift CLI
+RUN echo "Downloading OpenShift CLI for ${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}..." && \
 curl -sLfO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_CLIENT_VERSION}/openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz && \
 tar xvf openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz -C /usr/local/bin && \
-rm -rf openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz  && rm -f /usr/local/bin/kubectl && ln -sf /usr/local/bin/oc /usr/local/bin/kubectl && \
+rm -rf openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz  && rm -f /usr/local/bin/kubectl && ln -sf /usr/local/bin/oc /usr/local/bin/kubectl
+
+# Download yq and tea
+RUN echo "Downloading yq for ${TARGETARCH}..." && \
 curl -sSL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_${TARGETARCH} && chmod 755 /usr/local/bin/yq && \
+echo "Downloading tea for ${TARGETARCH}..." && \
 curl -sSL -o /usr/local/bin/tea https://gitea.com/gitea/tea/releases/download/v${TEA_VERSION}/tea-${TEA_VERSION}-linux-${TARGETARCH} && chmod 755 /usr/local/bin/tea && \
 rm -rf /root/anaconda* /root/original-ks.cfg /usr/local/README