From 891c9f4f477e50c5a0598f4e986c89317995f225 Mon Sep 17 00:00:00 2001 From: David Parker Date: Fri, 1 Nov 2024 16:47:32 +0000 Subject: [PATCH 1/4] [major] Upgrade to Python 3.11 --- image/cli-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cli-base/Dockerfile b/image/cli-base/Dockerfile index 379798f..9bd7ca4 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-311 ARG VERSION_LABEL ARG ARCHITECTURE # ----- Start as "default" user ---------------------------------------------- From 3d089b9a1682aff81d9185d7b1593f4dcc1411f1 Mon Sep 17 00:00:00 2001 From: David Parker Date: Sun, 23 Nov 2025 23:00:45 +0000 Subject: [PATCH 2/4] Move to python 3.14 --- image/cli-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cli-base/Dockerfile b/image/cli-base/Dockerfile index 6499e1a..811e29c 100644 --- a/image/cli-base/Dockerfile +++ b/image/cli-base/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311 +FROM registry.access.redhat.com/ubi9/python-314 ARG VERSION_LABEL ARG ARCHITECTURE # ----- Start as "default" user ---------------------------------------------- From 7caa91c008b64113d4130ae632eb5d1900bc8fbb Mon Sep 17 00:00:00 2001 From: David Parker Date: Sun, 23 Nov 2025 23:11:59 +0000 Subject: [PATCH 3/4] More currency updates --- README.md | 40 +++++++++++----------- image/cli-base/install/install-ibmcloud.sh | 2 +- image/cli-base/install/install-ibmpak.sh | 2 +- image/cli-base/install/install-yq.sh | 2 +- image/cli-base/install/requirements.txt | 16 ++++----- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 559e1b5..7c05515 100644 --- a/README.md +++ b/README.md @@ -3,23 +3,23 @@ This base container image allows us to build the CLI faster by separating the bu Provides: -| content | amd64 | s390x | arm64 | -| --- | --- |------| ----| -| `python3` v3.9 | ✔️ | ✔️ | ✔️ | -| `ibmcloud` v2.30.0 | ✔️ | ✔️ | ✔️ | -| `aws` | ✔️ | ❌ | ✔️ | -| `helm` v3 | ✔️ | ✔️ | ✔️ | -| `mongosh` v2.3.3 | ✔️ | ✔️ | ✔️ | -| `mongodump` v100.10.0 | ✔️ | ✔️ | ✔️ | -| `oc` | ✔️ | ✔️ | ✔️ | -| `oc mirror` | ✔️ | ✔️ | ✔️ | -| `oc ibm-pak` v1.16.2 | ✔️ | ✔️ | ✔️ | -| `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` | ✔️ | ✔️ | ✔️ | diff --git a/image/cli-base/install/install-ibmcloud.sh b/image/cli-base/install/install-ibmcloud.sh index ef8eea2..69670f5 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.30.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 mv Bluemix_CLI/bin/ibmcloud /usr/local/bin/ diff --git a/image/cli-base/install/install-ibmpak.sh b/image/cli-base/install/install-ibmpak.sh index 116cad6..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-plugin/releases/download/v1.16.2/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 ce665f8..a0dcc28 100644 --- a/image/cli-base/install/install-yq.sh +++ b/image/cli-base/install/install-yq.sh @@ -21,7 +21,7 @@ done 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 # yq_linux_s390x chmod 755 /usr/bin/yq diff --git a/image/cli-base/install/requirements.txt b/image/cli-base/install/requirements.txt index fa7e71f..d260c6c 100644 --- a/image/cli-base/install/requirements.txt +++ b/image/cli-base/install/requirements.txt @@ -1,13 +1,13 @@ 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 -slackclient==1.3.2 -jira==3.5.2 -boto3==1.34.143 \ No newline at end of file +slack-sdk==3.39.0 +jira==3.10.5 +boto3==1.41.2 From f7e8a1d0e446e7629af7a61838bfcbe889a97d0b Mon Sep 17 00:00:00 2001 From: David Parker Date: Sun, 23 Nov 2025 23:15:15 +0000 Subject: [PATCH 4/4] Update Dockerfile --- image/cli-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cli-base/Dockerfile b/image/cli-base/Dockerfile index 811e29c..be066d6 100644 --- a/image/cli-base/Dockerfile +++ b/image/cli-base/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-314 +FROM registry.access.redhat.com/ubi9/python-312 ARG VERSION_LABEL ARG ARCHITECTURE # ----- Start as "default" user ----------------------------------------------