From 0f3b17ac85efde82dcd4c3f1c4470a1e5a607515 Mon Sep 17 00:00:00 2001
From: Jan Wijffels <jwijffels@bnosac.be>
Date: Thu, 18 Apr 2024 17:54:42 +0200
Subject: [PATCH] shinyproxy rename

---
 shinyproxy/Dockerfile    | 11 ++++++-----
 shinyproxy/entrypoint.sh |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/shinyproxy/Dockerfile b/shinyproxy/Dockerfile
index 9006349..c29cf9d 100644
--- a/shinyproxy/Dockerfile
+++ b/shinyproxy/Dockerfile
@@ -6,17 +6,18 @@ ARG SHINYPROXY_VERSION=3.0.2
 ENV SHINYPROXY_VERSION=$SHINYPROXY_VERSION
 ARG SHINYPROXY_INSTALL_DIR=/opt/shinyproxy
 ENV SHINYPROXY_INSTALL_DIR=$SHINYPROXY_INSTALL_DIR
-ARG SHINYPROXY_APP_DIR=/etc/shinyproxy
-ENV SHINYPROXY_APP_DIR=$SHINYPROXY_APP_DIR
+ARG SHINYPROXY_APPLICATION_DIR=/etc/shinyproxy
+ENV SHINYPROXY_APPLICATION_DIR=$SHINYPROXY_APPLICATION_DIR
 
 ## Download ShinyProxy to /opt/shinyproxy
 WORKDIR $SHINYPROXY_INSTALL_DIR
 RUN wget https://www.shinyproxy.io/downloads/shinyproxy-${SHINYPROXY_VERSION}.jar -O shinyproxy.jar
 
-## Make sure 
+## Script init-application-yml.sh makes sure application.yml is put from ${SHINYPROXY_APPLICATION_DIR}/application.yml to ${SHINYPROXY_INSTALL_DIR}/application.yml 
+## Runs shinyproxy from the SHINYPROXY_INSTALL_DIR
 COPY ./entrypoint.sh init-application-yml.sh
-RUN chmod +x ./init-application-yml.sh & mkdir -p $SHINYPROXY_APP_DIR
-VOLUME $SHINYPROXY_APP_DIR
+RUN chmod +x ./init-application-yml.sh & mkdir -p $SHINYPROXY_APPLICATION_DIR
+VOLUME $SHINYPROXY_APPLICATION_DIR
 
 ENTRYPOINT ["sh", "./init-application-yml.sh"]
 
diff --git a/shinyproxy/entrypoint.sh b/shinyproxy/entrypoint.sh
index 908b655..57bf1a3 100644
--- a/shinyproxy/entrypoint.sh
+++ b/shinyproxy/entrypoint.sh
@@ -3,7 +3,7 @@ set -e
 
 echo "Initialising ShinyProxy configuration..."
 
-cd ${SHINYPROXY_APP_DIR}
+cd ${SHINYPROXY_APPLICATION_DIR}
 echo "  - checking ${PWD} for Shinyproxy config file"
 
 # substitute ${ENV_VARIABLE}s with container environment variables