diff --git a/README.md b/README.md index 3cda3e9..9e5bdfe 100644 --- a/README.md +++ b/README.md @@ -3,25 +3,25 @@ This base container image allows us to build the CLI faster by separating the bu Provides: -| content | amd64 | s390x | arm64 | ppc64le | -| --- | --- |------| ----|---------------------------------------------| -| `python3` v3.9 | ✔️ | ✔️ | ✔️ | ✔️ | -| `ibmcloud` v2.35.0 | ✔️ | ✔️ | ✔️ | ❌ | -| `aws` | ✔️ | ❌ | ✔️ | ❌ | -| `helm` v3 | ✔️ | ✔️ | ✔️ | ✔️ | -| `mongosh` v2.3.3 | ✔️ | ✔️ | ✔️ | ✔️ | -| `mongodump` v100.10.0 | ✔️ | ✔️ | ✔️ | ✔️ | -| `oc` | ✔️ | ✔️ | ✔️ | ✔️ | -| `oc mirror` | ✔️ | ✔️ | ✔️ | ✔️ | -| `oc ibm-pak` v1.18.1 | ✔️ | ✔️ | ✔️ |✔️ | -| `skopeo` | ✔️ | ✔️ | ✔️ | ✔️ | -| `nano` | ✔️ | ✔️ | ✔️ | ✔️ | -| `jq` | ✔️ | ✔️ | ✔️ | ✔️ | -| `yq` v4.44.5 | ✔️ | ✔️ | ✔️ | ✔️ | -| `tini` v0.19.0 | ✔️ | ✔️ | ✔️ | ✔️ | -| `rclone` | ✔️ | ✔️ | ✔️ | ✔️ | -| `rosa` | ✔️ | ❌ ️ | ✔️ | ❌ | -| `boto3` | ✔️ | ✔️ | ✔️ | ✔️ | -| `argocd` | ✔️ | ✔️ | ✔️ | ✔️ | +| content | amd64 | s390x | arm64 | +| --------------------- | ----- | ----- | ----- | +| `python3 v3.14` | ✔️ | ✔️ | ✔️ | +| `ibmcloud v2.38.1` | ✔️ | ✔️ | ✔️ | +| `aws` | ✔️ | ❌ | ✔️ | +| `helm v3` | ✔️ | ✔️ | ✔️ | +| `mongosh v2.3.3` | ✔️ | ✔️ | ✔️ | +| `mongodump v100.10.0` | ✔️ | ✔️ | ✔️ | +| `oc` | ✔️ | ✔️ | ✔️ | +| `oc mirror` | ✔️ | ✔️ | ✔️ | +| `oc ibm-pak v1.20.0` | ✔️ | ✔️ | ✔️ | +| `skopeo` | ✔️ | ✔️ | ✔️ | +| `nano` | ✔️ | ✔️ | ✔️ | +| `jq` | ✔️ | ✔️ | ✔️ | +| `yq v4.49.1` | ✔️ | ✔️ | ✔️ | +| `tini v0.19.0` | ✔️ | ✔️ | ✔️ | +| `rclone` | ✔️ | ✔️ | ✔️ | +| `rosa` | ✔️ | ❌ ️ | ✔️ | +| `boto3` | ✔️ | ✔️ | ✔️ | +| `argocd` | ✔️ | ✔️ | ✔️ | -Note: IBM Cloud Plugin Container-Registry is supported by ppc64le, however IBM Cloud Plugin Container-Service is not supported. \ No newline at end of file +Note: IBM Cloud `Container-Registry` plugin is supported on ppc64le, however the `Container-Service` plugin is not. diff --git a/image/cli-base/Dockerfile b/image/cli-base/Dockerfile index 49897e7..9e705bd 100644 --- a/image/cli-base/Dockerfile +++ b/image/cli-base/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-39 +FROM registry.access.redhat.com/ubi9/python-312 ARG VERSION_LABEL ARG ARCHITECTURE # ----- Start as "default" user ---------------------------------------------- diff --git a/image/cli-base/install/install-ibmcloud.sh b/image/cli-base/install/install-ibmcloud.sh index a31f1a0..8ed0cfa 100644 --- a/image/cli-base/install/install-ibmcloud.sh +++ b/image/cli-base/install/install-ibmcloud.sh @@ -23,7 +23,7 @@ if [[ "$TARGET_PLATFORM" == "" ]] then TARGET_PLATFORM=amd64 fi -CLI_VERSION=2.35.0 +CLI_VERSION=2.38.1 wget -q https://download.clis.cloud.ibm.com/ibm-cloud-cli/${CLI_VERSION}/IBM_Cloud_CLI_${CLI_VERSION}_${TARGET_PLATFORM}.tar.gz tar -xzf IBM_Cloud_CLI_${CLI_VERSION}_${TARGET_PLATFORM}.tar.gz diff --git a/image/cli-base/install/install-ibmpak.sh b/image/cli-base/install/install-ibmpak.sh index 49cb689..6895ac3 100644 --- a/image/cli-base/install/install-ibmpak.sh +++ b/image/cli-base/install/install-ibmpak.sh @@ -24,7 +24,7 @@ if [[ "$TARGET_PLATFORM" == "" ]] fi if [[ "$TARGET_PLATFORM" != "arm64" ]]; then - curl -L https://github.com/IBM/ibm-pak/releases/download/v1.18.1/oc-ibm_pak-linux-$TARGET_PLATFORM.tar.gz -o oc-ibm_pak-linux-$TARGET_PLATFORM.tar.gz + curl -L https://github.com/IBM/ibm-pak-plugin/releases/download/v1.20.0/oc-ibm_pak-linux-$TARGET_PLATFORM.tar.gz -o oc-ibm_pak-linux-$TARGET_PLATFORM.tar.gz tar -xf oc-ibm_pak-linux-$TARGET_PLATFORM.tar.gz mv oc-ibm_pak-linux-$TARGET_PLATFORM /usr/local/bin/oc-ibm_pak rm oc-ibm_pak-linux-$TARGET_PLATFORM.tar.gz diff --git a/image/cli-base/install/install-yq.sh b/image/cli-base/install/install-yq.sh index edee714..d689eb8 100644 --- a/image/cli-base/install/install-yq.sh +++ b/image/cli-base/install/install-yq.sh @@ -17,11 +17,12 @@ do shift shift done -#fallback to amd64 if architecture not defined + +# Fallback to amd64 if architecture not defined if [[ "$TARGET_PLATFORM" == "" ]] then TARGET_PLATFORM=amd64 fi -curl -L "https://github.com/mikefarah/yq/releases/download/v4.44.5/yq_linux_${TARGET_PLATFORM}" > /usr/bin/yq +curl -L "https://github.com/mikefarah/yq/releases/download/v4.49.1/yq_linux_${TARGET_PLATFORM}" > /usr/bin/yq chmod 755 /usr/bin/yq echo "yq version:" diff --git a/image/cli-base/install/requirements.txt b/image/cli-base/install/requirements.txt index e3e69ff..fb7e5ae 100644 --- a/image/cli-base/install/requirements.txt +++ b/image/cli-base/install/requirements.txt @@ -1,14 +1,14 @@ junit_xml==1.9 -pymongo==4.5.0 +pymongo==4.15.4 xmljson==0.2.1 -ansible==8.5.0 -kubernetes==28.1.0 +ansible==13.0.0 +kubernetes==34.1.0 openshift==0.13.2 jmespath==1.0.1 -click==8.1.7 -prettytable==3.9.0 +click==8.3.1 +prettytable==3.17.0 jinja-cli==1.2.2 -jinjanator==25.1.0 -slackclient==1.3.2 -jira==3.5.2 -boto3==1.34.143 \ No newline at end of file +jinjanator==25.3.0 +slack-sdk==3.39.0 +jira==3.10.5 +boto3==1.41.2