Update tool-box image with latest versions + new tools (#597)

* Update image with latest versions + new tools * Updated README with latest info
redhat-cop · Apr 27, 2023 · 543b150 · 543b150
1 parent eb89e4a
commit 543b150
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 deletions.
diff --git a/tool-box/Dockerfile b/tool-box/Dockerfile
@@ -1,13 +1,14 @@
 FROM registry.access.redhat.com/ubi8
 
-ENV OC_VERSION=4.9.5 \
-    ODO_VERSION=v2.3.1 \
-    ANSIBLE_VERSION=2.9 \
+ENV OC_VERSION=stable-4.12 \
+    ROSA_VERSION=1.2.15 \
+    ODO_VERSION=v3.9.0 \
+    ANSIBLE_VERSION=2.14.5 \
     JQ_VERSION=1.6 \
-    HELM_VERSION=v3.2.3 \
-    TEKTON_VERSION=0.21.0 \
+    HELM_VERSION=v3.11.3 \
+    TEKTON_VERSION=0.30.1 \
     HOME=/home/tool-box \
-    INSTALL_PKGS="git vim zip unzip python36"
+    INSTALL_PKGS="git iputils procps-ng python39 vim unzip zip"
 
 RUN yum -y update && \
     yum -y install $INSTALL_PKGS && \
@@ -20,18 +21,25 @@ RUN curl -o jq --fail -sL https://github.com/stedolan/jq/releases/download/jq-${
 RUN mkdir -m 775 $HOME && \
     chmod 775 /etc/passwd && \
     pip3 install --upgrade pip && \
-    pip3 install git+https://github.com/ansible/ansible.git@stable-${ANSIBLE_VERSION}
+    pip3 install ansible-core==${ANSIBLE_VERSION} 
 
 RUN curl --fail -s https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -xvz && \
     chmod u+x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/ && rm -rf linux-amd64
 
 RUN curl --fail -sL https://github.com/tektoncd/cli/releases/download/v${TEKTON_VERSION}/tkn_${TEKTON_VERSION}_Linux_x86_64.tar.gz | tar --no-same-owner -xvz -C /usr/local/bin/ tkn
 
-RUN curl --fail -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux-${OC_VERSION}.tar.gz | tar -C /usr/local/bin/ -xzf -
+RUN curl --fail -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz | tar -C /usr/local/bin/ -xzf -
+
+RUN curl --fail -sL https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/rosa/${ROSA_VERSION}/rosa-linux.tar.gz | tar -C /usr/local/bin/ -xzf -
 
 RUN curl --fail -sL https://mirror.openshift.com/pub/openshift-v4/clients/odo/${ODO_VERSION}/odo-linux-amd64 -o /usr/local/bin/odo && \
     chmod +x /usr/local/bin/odo
 
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install -i /usr/local/aws-cli -b /usr/local/bin; \
+    rm -rf awscliv2.zip aws
+
 WORKDIR $HOME
 
 ADD ./root /

diff --git a/tool-box/README.md b/tool-box/README.md
@@ -6,16 +6,20 @@ This container exists to help people that can't install ansible, git or other ne
 
 ## What's in the box? 👱‍♂
 
-- `oc` version 4.9.5
-- `ansible` v2.9 (stable from `pip`)
-- `python` v3.6
-- `git` 2.18.4
-- `zip`
-- `unzip` 6.0-43
+- `oc` version stable-4.12
+- `rosa` version 1.2.15
+- `ansible` v2.14.5 (stable from `pip`)
+- `python` v3.9
+- `git` (latest stable)
+- `zip` (latest stable)
+- `unzip` (latest stable)
 - `jq` v1.6
-- `odo` 1.2.1
-- `helm` Client v3.2.3
-- `tkn` Client v0.21.0
+- `odo` 3.9.9
+- `helm` Client v3.11.3
+- `tkn` Client v0.30.1
+- `iputils` (latest stable)
+- `procps-ng (latest stable)
+- `aws` (latest stable)
 
 If you need something not here, let us know in an issue or submit a PR.