Update base image and cli versions

Signed-off-by: Sean Sundberg <seansund@us.ibm.com>

Author: Sean Sundberg

.github/workflows/docker-build.yaml

@@ -20,12 +20,13 @@ jobs:
           - alpine
           - fedora
         terraform:
-          - v1.0
-          - v1.1
-          - v1.2
+          - v1.6
+          - v1.7
+          - v1.8
+          - v1.9
 
     env:
-      TERRAFORM_LATEST: "v1.2"
+      TERRAFORM_LATEST: "v1.9"
 
     steps:
       - name: Checkout

Containerfile-alpine

@@ -1,19 +1,19 @@
-ARG TERRAFORM_VERSION=v1.2
+ARG TERRAFORM_VERSION=v1.9
 FROM quay.io/cloudnativetoolkit/terraform:${TERRAFORM_VERSION}-v4.0.0-alpine
 
 ARG TARGETPLATFORM
 ARG BASE_OS=alpine
-ARG OPENSHIFT_CLI_VERSION=4.10
-ARG KUBESEAL_VERSION=0.18.1
-ARG ARGOCD_VERSION=2.4.6
-ARG KUSTOMIZE_VERSION=4.5.5
-ARG TKN_VERSION=0.23.1
+ARG OPENSHIFT_CLI_VERSION=4.17
+ARG KUBESEAL_VERSION=0.28.0
+ARG ARGOCD_VERSION=2.14.4
+ARG KUSTOMIZE_VERSION=5.6.0
+ARG TKN_VERSION=1.17.1
 
 ENV TF_CLI_ARGS_apply="-parallelism=6"
 ENV TF_LOG_PROVIDER_gitops=DEBUG
 ENV TF_LOG_PROVIDER_clis=DEBUG
 
-RUN sudo apk add --no-cache \
+RUN sudo apk add --no-cache --force-broken-world \
   ca-certificates \
   perl \
   openvpn \
@@ -28,9 +28,7 @@ COPY --chown=devops:root src/home/ ${HOME}/
 
 WORKDIR ${HOME}
 
-RUN cat ./image-message >> ./.bashrc-ni
-
-RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/clients/ocp/stable-${OPENSHIFT_CLI_VERSION}/openshift-client-linux.tar.gz --output oc-client.tar.gz && \
+RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/clients/ocp/stable-${OPENSHIFT_CLI_VERSION}/openshift-client-linux.tar.gz --output oc-client.tar.gz && \
     mkdir tmp && \
     cd tmp && \
     tar xzf ../oc-client.tar.gz && \
@@ -39,20 +37,20 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFO
     rm -rf tmp && \
     rm oc-client.tar.gz
 
-RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/kubectl" && \
+RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/kubectl" && \
     chmod +x ./kubectl && \
     sudo mv ./kubectl /usr/local/bin && \
     kubectl version --client
 
-RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/releases/tags/3.4.1 | jq -r --arg NAME "yq_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)" '.assets[] | select(.name == $NAME) | .browser_download_url') && \
+RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/releases/tags/3.4.1 | jq -r --arg NAME "yq_linux_$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)" '.assets[] | select(.name == $NAME) | .browser_download_url') && \
     chmod +x ./yq3 && \
     sudo mv ./yq3 /usr/bin/yq3 && \
     yq3 --version
 
 RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash && helm version
 
 ## kubeseal
-RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
+RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
     mkdir tmp && \
     cd tmp && \
     tar xzf ../kubeseal.tar.gz && \
@@ -64,13 +62,13 @@ RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/rel
     kubeseal --version
 
 ## argocd
-RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
+RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
     chmod +x argocd && \
     sudo mv argocd /usr/local/bin && \
     argocd version --client
 
 ## kustomize
-RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
+RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
     mkdir tmp && \
     cd tmp && \
     tar xzf ../kustomize.tar.gz && \
@@ -81,21 +79,19 @@ RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/rele
     kustomize version
 
 ## tkn
-RUN if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then exit 0; fi; \
-  curl -sLo tkn.tar.gz https://mirror.openshift.com/pub/openshift-v4/amd64/clients/pipeline/${TKN_VERSION}/tkn-linux-amd64-${TKN_VERSION}.tar.gz && \
-  mkdir tmp && \
+RUN mkdir tmp && \
   cd tmp && \
-  tar xzf ../tkn.tar.gz && \
+  curl -sLo tkn.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/${TKN_VERSION}/tkn-linux-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
+  tar xzf tkn.tar.gz && \
   sudo mv tkn /usr/local/bin && \
   cd .. && \
   rm -rf tmp && \
-  rm tkn.tar.gz && \
   tkn version
 
 ARG IGC_VERSION=1.42.3
 
 ## igc
-RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v${IGC_VERSION}/igc-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
+RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v${IGC_VERSION}/igc-${BASE_OS}-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
     chmod +x igc && \
     sudo mv igc /usr/local/bin && \
     sudo igc plugins --path /usr/local/bin && \
@@ -104,11 +100,11 @@ RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-c
 ARG GITU_VERSION=1.14.7
 
 ## gitu
-RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v${GITU_VERSION}/gitu-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
+RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v${GITU_VERSION}/gitu-${BASE_OS}-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
     chmod +x gitu && \
     sudo mv gitu /usr/local/bin && \
     gitu --version
 
 VOLUME /workspaces
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "cat ./image-message && /bin/bash"]

Containerfile-fedora

@@ -1,13 +1,13 @@
-ARG TERRAFORM_VERSION=v1.2
+ARG TERRAFORM_VERSION=v1.9
 FROM quay.io/cloudnativetoolkit/terraform:${TERRAFORM_VERSION}-v4.0.0-fedora
 
 ARG TARGETPLATFORM
 ARG BASE_OS=linux
-ARG OPENSHIFT_CLI_VERSION=4.10
-ARG KUBESEAL_VERSION=0.18.1
-ARG ARGOCD_VERSION=2.4.6
-ARG KUSTOMIZE_VERSION=4.5.5
-ARG TKN_VERSION=0.23.1
+ARG OPENSHIFT_CLI_VERSION=4.17
+ARG KUBESEAL_VERSION=0.28.0
+ARG ARGOCD_VERSION=2.14.4
+ARG KUSTOMIZE_VERSION=5.6.0
+ARG TKN_VERSION=1.17.1
 
 ENV TF_CLI_ARGS_apply="-parallelism=6"
 ENV TF_LOG_PROVIDER_gitops=DEBUG
@@ -28,9 +28,7 @@ COPY --chown=devops:root src/home/ ${HOME}/
 
 WORKDIR ${HOME}
 
-RUN cat ./image-message >> ./.bashrc-ni
-
-RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/clients/ocp/stable-${OPENSHIFT_CLI_VERSION}/openshift-client-linux.tar.gz --output oc-client.tar.gz && \
+RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/clients/ocp/stable-${OPENSHIFT_CLI_VERSION}/openshift-client-linux.tar.gz --output oc-client.tar.gz && \
     mkdir tmp && \
     cd tmp && \
     tar xzf ../oc-client.tar.gz && \
@@ -39,25 +37,20 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFO
     rm -rf tmp && \
     rm oc-client.tar.gz
 
-RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/kubectl" && \
+RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/kubectl" && \
     chmod +x ./kubectl && \
     sudo mv ./kubectl /usr/local/bin && \
     kubectl version --client
 
-RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/releases/tags/3.4.1 | jq -r --arg NAME "yq_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)" '.assets[] | select(.name == $NAME) | .browser_download_url') && \
+RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/releases/tags/3.4.1 | jq -r --arg NAME "yq_linux_$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)" '.assets[] | select(.name == $NAME) | .browser_download_url') && \
     chmod +x ./yq3 && \
     sudo mv ./yq3 /usr/bin/yq3 && \
     yq3 --version
 
-RUN curl -sL -o ./helm.tar.gz https://get.helm.sh/helm-v3.8.2-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
-    tar xzf ./helm.tar.gz linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/helm && \
-    sudo mv ./linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/helm /usr/bin/helm && \
-    rmdir ./linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
-    rm ./helm.tar.gz && \
-    helm version
+RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash && helm version
 
 ## kubeseal
-RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
+RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
     mkdir tmp && \
     cd tmp && \
     tar xzf ../kubeseal.tar.gz && \
@@ -69,13 +62,13 @@ RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/rel
     kubeseal --version
 
 ## argocd
-RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
+RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
     chmod +x argocd && \
     sudo mv argocd /usr/local/bin && \
     argocd version --client
 
 ## kustomize
-RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
+RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
     mkdir tmp && \
     cd tmp && \
     tar xzf ../kustomize.tar.gz && \
@@ -86,21 +79,19 @@ RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/rele
     kustomize version
 
 ## tkn
-RUN if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then exit 0; fi; \
-  curl -sLo tkn.tar.gz https://mirror.openshift.com/pub/openshift-v4/amd64/clients/pipeline/${TKN_VERSION}/tkn-linux-amd64-${TKN_VERSION}.tar.gz && \
-  mkdir tmp && \
+RUN mkdir tmp && \
   cd tmp && \
-  tar xzf ../tkn.tar.gz && \
+  curl -sLo tkn.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/${TKN_VERSION}/tkn-linux-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
+  tar xzf tkn.tar.gz && \
   sudo mv tkn /usr/local/bin && \
   cd .. && \
   rm -rf tmp && \
-  rm tkn.tar.gz && \
   tkn version
 
 ARG IGC_VERSION=1.42.3
 
 ## igc
-RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v${IGC_VERSION}/igc-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
+RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v${IGC_VERSION}/igc-${BASE_OS}-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
     chmod +x igc && \
     sudo mv igc /usr/local/bin && \
     sudo igc plugins --path /usr/local/bin && \
@@ -109,11 +100,11 @@ RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-c
 ARG GITU_VERSION=1.14.7
 
 ## gitu
-RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v${GITU_VERSION}/gitu-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
+RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v${GITU_VERSION}/gitu-${BASE_OS}-$(if [[ "$TARGETPLATFORM" =~ "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
     chmod +x gitu && \
     sudo mv gitu /usr/local/bin && \
     gitu --version
 
 VOLUME /workspaces
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c", "cat ./image-message && /bin/bash"]