docker: adds DEBUG_LEVEL and ensures start-script vars are set

docker/Dockerfile.soda

@@ -57,7 +57,7 @@ RUN chmod -R a+rwX conf
 
 # enable SKA IAM token filter update
 RUN chmod a+rw ${WEBAPP_DIR}/WEB-INF/web.xml \
- && chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/iamtoken.properties
+ && chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/*.properties
 
 env ACCESS_CONTEXT_ROOT=datasets
 # configure during start-up

docker/deps/soda.logging.properties

@@ -65,4 +65,7 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.ut
 
 # vlkb-soda
 ServletCutout.level = CONFIG
+ResolverFromId.level = INFO
+SodaImpl.level = INFO
+VlkbCli.level = INFO
 

docker/start-soda.sh.soda

@@ -6,6 +6,13 @@ set -eux
 date
 env
 
+# set optional
+ACCESS_CONTEXT_ROOT=${ACCESS_CONTEXT_ROOT:-datasets}
+SECURITY=${SECURITY:-}
+KEYSTORE_ALIAS=${KEYSTORE_ALIAS:-}
+SKAIAM_INTROSPECT=${SKAIAM_INTROSPECT:-}
+SKAIAM_CLIENT=${SKAIAM_CLIENT:-}
+SKAIAM_PASSWORD=${SKAIAM_PASSWORD:-}
 
 # configure CONTEXT_ROOT
 
@@ -35,13 +42,11 @@ then
    cp $CATALINA_BASE/conf/server-connector.xml-8443 $CATALINA_BASE/conf/server-connector.xml
 fi
 
-case $KEYSTORE_ALIAS in
-   *)
+if [ -n $KEYSTORE_ALIAS ];
+then
       echo "KEYSTORE_ALIAS: "$KEYSTORE_ALIAS
       sed -i "s/tomcat/$KEYSTORE_ALIAS/" $CATALINA_BASE/conf/server-connector.xml
-      ;;
-esac
-
+fi
 
 # configure SKA IAM
 
@@ -61,6 +66,13 @@ else
    cp $WEBAPP_DIR/WEB-INF/web-cutout-iamtoken.xml $WEBAPP_DIR/WEB-INF/web.xml
 fi
 
+# config debug
+DBG_LEVEL=${DEBUG_LEVEL:-CONFIG}
+sed -i "s/.*ServletCutout\.level.*=.*/ServletCutout.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
+sed -i "s/.*ResolverFromId\.level.*=.*/ResolverFromId.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
+sed -i "s/.*SodaImpl\.level.*=.*/SodaImpl.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
+sed -i "s/.*VlkbCli\.level.*=.*/VlkbCli.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties
+
 
 date
 } 1> /tmp/start-soda.log 2>&1