From 19422490878719b65dda2bea9af3e1b5c52c147a Mon Sep 17 00:00:00 2001
From: Meezaan-ud-Din A Wal-Ikram <m@meezaan.net>
Date: Mon, 24 Jun 2024 10:08:41 +0400
Subject: [PATCH] Update 8.3 cli image

---
 8/8.3/Dockerfile.cli | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/8/8.3/Dockerfile.cli b/8/8.3/Dockerfile.cli
index f267591..82c6f21 100644
--- a/8/8.3/Dockerfile.cli
+++ b/8/8.3/Dockerfile.cli
@@ -30,7 +30,7 @@ RUN apt-get -y update && apt-get -y upgrade && ACCEPT_EULA=Y && apt-get install
         gnupg \
         gnupg2 \
         zip \
-        git \
+        git curl gittext-base jq \
         gcc \
         g++ \
         librdkafka-dev \
@@ -50,11 +50,6 @@ RUN apt-get -y update && apt-get -y upgrade && ACCEPT_EULA=Y && apt-get install
     && docker-php-ext-enable redis apcu memcached timezonedb rdkafka yaml \
     && printf "log_errors = On \nerror_log = /dev/stderr\n" > /usr/local/etc/php/conf.d/php-logs.ini
 
-# Install yq
-RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && \
-  chmod +x /usr/bin/yq
-
-
 # PHP settings
 COPY etc/php/production.ini /usr/local/etc/php/conf.d/production.ini
 
@@ -64,6 +59,14 @@ COPY etc/ssh/* /usr/local/ssh/
 RUN sh /usr/local/ssh/install-composer.sh && \
     mv composer.phar /usr/local/bin/composer
 
+## Install kubectl and yq
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
+  chmod u+x ./kubectl && \ 
+  mv ./kubectl /usr/bin/kubectl && \
+  wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && \
+  chmod +x /usr/bin/yq
+
+
 ### PROD ENVIRONMENT SPECIFIC ###
 ################################