From 27b0dac951a2ef31b7c8de08f970386af0f35c2f Mon Sep 17 00:00:00 2001
From: Todor Ivanov <todor.trendafilov.ivanov@cern.ch>
Date: Mon, 11 Mar 2024 10:00:26 +0100
Subject: [PATCH] Add SqlCl client

---
 docker/pypi/wmagent/Dockerfile           | 12 ++++++++++--
 docker/pypi/wmagent/bin/manage-common.sh |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile
index 9d0310d2e..efad6ec7e 100644
--- a/docker/pypi/wmagent/Dockerfile
+++ b/docker/pypi/wmagent/Dockerfile
@@ -30,8 +30,6 @@ ENV WMA_LOG_DIR=$WMA_CURRENT_DIR/logs
 ENV WMA_DEPLOY_DIR=/usr/local
 ENV WMA_ENV_FILE=$WMA_DEPLOY_DIR/deploy/env.sh
 ENV WMA_SECRETS_FILE=$WMA_ADMIN_DIR/WMAgent.secrets
-ENV ORACLE_PATH=$WMA_DEPLOY_DIR/etc/oracle
-
 
 # Setting up users and previleges
 RUN groupadd -g ${WMA_GID} ${WMA_GROUP}
@@ -47,6 +45,16 @@ RUN echo "${WMA_USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 ADD bin $WMA_DEPLOY_DIR/bin
 ADD etc $WMA_DEPLOY_DIR/etc
 
+# Oracle features (must be added after bin/):
+ENV ORACLE_PATH=$WMA_DEPLOY_DIR/etc/oracle
+ENV SQLCL_VER=sqlcl-23.4.0.023.2321
+RUN wget -P $WMA_DEPLOY_DIR/ https://download.oracle.com/otn_software/java/sqldeveloper/${SQLCL_VER}.zip && \
+    echo "f0adb2b8b60c248f5f15e0dc1e95876262316460b4ebf85e601116d73dad19ce $WMA_DEPLOY_DIR/${SQLCL_VER}.zip" > $WMA_DEPLOY_DIR/${SQLCL_VER}.sha256 && \
+    sha256sum $WMA_DEPLOY_DIR/${SQLCL_VER}.sha256 && unzip -d $WMA_DEPLOY_DIR/ $WMA_DEPLOY_DIR/${SQLCL_VER}.zip
+ENV PATH="$PATH:$WMA_DEPLOY_DIR/sqlcl/bin:"
+RUN apt-get update
+RUN apt-get install -y openjdk-17-jre && apt-get clean
+
 # Add install script
 ADD install.sh ${WMA_ROOT_DIR}/install.sh
 
diff --git a/docker/pypi/wmagent/bin/manage-common.sh b/docker/pypi/wmagent/bin/manage-common.sh
index 1205de1e8..2339f99a4 100644
--- a/docker/pypi/wmagent/bin/manage-common.sh
+++ b/docker/pypi/wmagent/bin/manage-common.sh
@@ -98,7 +98,7 @@ _exec_oracle() {
     if $isInitCall || $hasArgs; then
         ( unset ORACLE_PATH; echo -e $execStr | sqlplus -NOLOGINTIME -S $ORACLE_USER/$ORACLE_PASS@$ORACLE_TNS )
     elif $isPipe || ! $hasArgs; then
-        rlwrap -H $WMA_LOG_DIR/.sqlplus_history -pgreen sqlplus $ORACLE_USER/$ORACLE_PASS@$ORACLE_TNS
+        rlwrap -H $WMA_LOG_DIR/.sqlplus_history -pgreen sql $ORACLE_USER/$ORACLE_PASS@$ORACLE_TNS
     else
         echo "$FUNCNAME: ERROR: Unhandled type of call with: isPipe: $isPipe &&  noArgs: $noArgs && isInitCall: $isInitCall"
         return $(false)