diff --git a/README.md b/README.md index aa99d90..dd622d8 100644 --- a/README.md +++ b/README.md @@ -3,26 +3,31 @@ This base container image allows us to build the CLI faster by separating the bu Provides: -| 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` | ✔️ | ✔️ | ✔️ | -| `redis-cli` | ✔️ | ✔️ | ✔️ | +| content | amd64 | s390x | ppc64le | arm64 | +| --------------------- | ----- | ----- | ------- | ----- | +| `python3 v3.12` | ✔️ | ✔️ | ✔️ | ✔️ | +| `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` | ✔️ | ✔️ | ✔️ | ✔️ | +| `redis-cli` | ✔️ | ✔️ | ✔️ | ✔️ | +| `ibm_db v3.2.3` | ✔️ | ✔️ | ✔️ | ❌ | +| `libxcrypt-compat` | ✔️ | ✔️ | ✔️ | ✔️ | +| `cpio` | ✔️ | ✔️ | ✔️ | ✔️ | -Note: IBM Cloud `Container-Registry` plugin is supported on ppc64le, however the `Container-Service` plugin is not. +**Notes:** +- IBM Cloud `Container-Registry` plugin is supported on ppc64le, however the `Container-Service` plugin is not. +- `ibm_db` (DB2 Python driver) is not supported on arm64 architecture due to upstream limitations. diff --git a/image/cli-base/Dockerfile b/image/cli-base/Dockerfile index f04c81d..35014b5 100644 --- a/image/cli-base/Dockerfile +++ b/image/cli-base/Dockerfile @@ -9,7 +9,7 @@ ARG ARCHITECTURE USER root RUN dnf update -y --skip-broken --nobest &&\ dnf upgrade -y --skip-broken --nobest &&\ - dnf install nano jq -y &&\ + dnf install nano jq libxcrypt-compat cpio -y &&\ dnf clean all # 2. Upgrade pip, install wheel, then install Python modules diff --git a/image/cli-base/install/requirements.txt b/image/cli-base/install/requirements.txt index e74da3c..dd9b0d4 100644 --- a/image/cli-base/install/requirements.txt +++ b/image/cli-base/install/requirements.txt @@ -12,3 +12,4 @@ jinjanator==25.3.1 slack-sdk==3.39.0 jira==3.10.5 boto3==1.41.5 +ibm_db==3.2.3; platform_machine != "aarch64"