Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Note: IBM Cloud `Container-Registry` plugin is supported on ppc64le, however the `Container-Service` plugin is not.
2 changes: 1 addition & 1 deletion image/cli-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 ----------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion image/cli-base/install/install-ibmcloud.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion image/cli-base/install/install-ibmpak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions image/cli-base/install/install-yq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
18 changes: 9 additions & 9 deletions image/cli-base/install/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
jinjanator==25.3.0
slack-sdk==3.39.0
jira==3.10.5
boto3==1.41.2