2 files changed, 43 insertions, 72 deletions
diff --git a/aai-schema-service/src/main/docker/Dockerfile b/aai-schema-service/src/main/docker/Dockerfile
index 73cdfd7..6efa8d1 100644
--- a/aai-schema-service/src/main/docker/Dockerfile
+++ b/aai-schema-service/src/main/docker/Dockerfile
@@ -1,28 +1,30 @@
 FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
-RUN  mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-SCHEMA-SERVICE /opt/app/aai-schema-service/logs/gc
+# Add the proper files into the docker image from your build
+WORKDIR /opt/app/aai-schema-service
 
-VOLUME /opt/aai/logroot/AAI-SS
-VOLUME /tmp
-VOLUME /opt/tools
+# Expose the ports for outside linux to use
+# 8447 is the important one to be used
+EXPOSE 8447
 
 HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8452 || exit 1
 
-RUN groupadd aaiadmin -g 1000
+ENTRYPOINT ["/sbin/tini", "--", "/bin/bash", "/opt/app/aai-schema-service/docker-entrypoint.sh"]
 
-RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
+VOLUME /tmp
+VOLUME /opt/tools
 
-# Add the proper files into the docker image from your build
-WORKDIR /opt/app/aai-schema-service
+USER root
 
-RUN chown -R aaiadmin:aaiadmin /opt/app/aai-schema-service /etc/profile.d /opt/aai/logroot/AAI-SS /opt/app /opt/aai/logroot /opt/app/aai-schema-service/logs/gc
+COPY --chown=aaiadmin:aaiadmin /maven/aai-schema-service/ /opt/app/aai-schema-service
 
-COPY --chown=aaiadmin:aaiadmin /maven/aai-schema-service/ .
+RUN  mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-SS && \
+     chown -R aaiadmin:aaiadmin /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-SS && \
+     chmod 777 /opt/app/aai-schema-service /opt/app/aai-schema-service/resources/etc/auth
 
-USER aaiadmin
 
 ENV AAI_BUILD_VERSION @aai.docker.version@
-# Expose the ports for outside linux to use
-# 8452 is the important one to be used
-EXPOSE 8452
-ENTRYPOINT ["/bin/bash", "/opt/app/aai-schema-service/docker-entrypoint.sh"]
+
+WORKDIR /opt/app/aai-schema-service
+
+USER aaiadmin
diff --git a/aai-schema-service/src/main/docker/docker-entrypoint.sh b/aai-schema-service/src/main/docker/docker-entrypoint.sh
index 6d1161d..1f33bdd 100644
--- a/aai-schema-service/src/main/docker/docker-entrypoint.sh
+++ b/aai-schema-service/src/main/docker/docker-entrypoint.sh
@@ -18,87 +18,56 @@
 # ============LICENSE_END=========================================================
 ###
 
-APP_HOME=$(pwd);
+APP_HOME=/opt/app/aai-schema-service;
 RESOURCES_HOME=${APP_HOME}/resources/;
 
 export SERVER_PORT=${SERVER_PORT:-8452};
 
-find /opt/app/ -name "*.sh" -exec chmod +x {} +
+if [[ ! -h "${APP_HOME}/scripts" ]]; then
 
-if [ -f ${APP_HOME}/aai.sh ]; then
+  ln -s ${APP_HOME}/bin ${APP_HOME}/scripts;
+  ln -s /opt/aai/logroot/AAI-SS ${APP_HOME}/logs;
 
-    ln -s bin scripts
-    ln -s /opt/aai/logroot/AAI-SS logs
+  if [ ! -f ${APP_HOME}/bin/updatePem.sh ]; then
+      echo "Unable to find the updatePem script";
+      exit 1;
+  else
+      ${APP_HOME}/bin/updatePem.sh
+  fi;
 
-    mv ${APP_HOME}/aai.sh /etc/profile.d/aai.sh
-    chmod 755 /etc/profile.d/aai.sh
+fi
 
-    scriptName=$1;
+scriptName=$1;
 
-    if [ ! -z $scriptName ]; then
+if [ ! -z $scriptName ]; then
 
-        if [ -f ${APP_HOME}/bin/${scriptName} ]; then
-            shift 1;
-            ${APP_HOME}/bin/${scriptName} "$@" || {
-                echo "Failed to run the ${scriptName}";
-                exit 1;
-            }
-        else
-            echo "Unable to find the script ${scriptName} in ${APP_HOME}/bin";
+    if [ -f ${APP_HOME}/bin/${scriptName} ]; then
+        shift 1;
+        ${APP_HOME}/bin/${scriptName} "$@" || {
+            echo "Failed to run the ${scriptName}";
             exit 1;
-        fi;
-
-        exit 0;
+        }
+    else
+        echo "Unable to find the script ${scriptName} in ${APP_HOME}/bin";
+        exit 1;
     fi;
 
+    exit 0;
 fi;
 
+mkdir -p /opt/app/aai-schema-service/logs/gc
+mkdir -p /opt/app/aai-schema-service/logs/heap-dumps
+
 if [ -f ${APP_HOME}/resources/aai-schema-service-swm-vars.sh ]; then
     source ${APP_HOME}/resources/aai-schema-service-swm-vars.sh;
 fi;
 
-if [ ! -z "${HEAP_SIZE}" ]; then
-    MIN_HEAP_SIZE=${HEAP_SIZE};
-    MAX_HEAP_SIZE=${HEAP_SIZE};
-fi;
-
-MIN_HEAP_SIZE=${MIN_HEAP_SIZE:-512m};
-MAX_HEAP_SIZE=${MAX_HEAP_SIZE:-1024m};
-MAX_METASPACE_SIZE=${MAX_METASPACE_SIZE:-512m};
-
 JAVA_CMD="exec java";
 
-JVM_OPTS="${PRE_JVM_ARGS} -Xloggc:/opt/app/aai-schema-service/logs/gc/aai_gc.log";
-JVM_OPTS="${JVM_OPTS} -XX:HeapDumpPath=/opt/app/aai-schema-service/logs/ajsc-jetty/heap-dump";
-JVM_OPTS="${JVM_OPTS} -Xms${MIN_HEAP_SIZE}";
-JVM_OPTS="${JVM_OPTS} -Xmx${MAX_HEAP_SIZE}";
-
-JVM_OPTS="${JVM_OPTS} -XX:+PrintGCDetails";
-JVM_OPTS="${JVM_OPTS} -XX:+PrintGCTimeStamps";
-JVM_OPTS="${JVM_OPTS} -XX:MaxMetaspaceSize=${MAX_METASPACE_SIZE}";
-
-JVM_OPTS="${JVM_OPTS} -server";
-JVM_OPTS="${JVM_OPTS} -XX:NewSize=512m";
-JVM_OPTS="${JVM_OPTS} -XX:MaxNewSize=512m";
-JVM_OPTS="${JVM_OPTS} -XX:SurvivorRatio=8";
-JVM_OPTS="${JVM_OPTS} -XX:+DisableExplicitGC";
-JVM_OPTS="${JVM_OPTS} -verbose:gc";
-JVM_OPTS="${JVM_OPTS} -XX:+UseParNewGC";
-JVM_OPTS="${JVM_OPTS} -XX:+CMSParallelRemarkEnabled";
-JVM_OPTS="${JVM_OPTS} -XX:+CMSClassUnloadingEnabled";
-JVM_OPTS="${JVM_OPTS} -XX:+UseConcMarkSweepGC";
-JVM_OPTS="${JVM_OPTS} -XX:-UseBiasedLocking";
-JVM_OPTS="${JVM_OPTS} -XX:ParallelGCThreads=4";
-JVM_OPTS="${JVM_OPTS} -XX:LargePageSizeInBytes=128m";
-JVM_OPTS="${JVM_OPTS} -XX:+PrintGCDetails";
-JVM_OPTS="${JVM_OPTS} -XX:+PrintGCTimeStamps";
+JVM_OPTS="${PRE_JVM_ARGS}";
 JVM_OPTS="${JVM_OPTS} -Dsun.net.inetaddr.ttl=180";
-JVM_OPTS="${JVM_OPTS} -XX:+HeapDumpOnOutOfMemoryError";
 JVM_OPTS="${JVM_OPTS} ${POST_JVM_ARGS}";
 JAVA_OPTS="${PRE_JAVA_OPTS} -DAJSC_HOME=$APP_HOME";
-if [ -f ${INTROSCOPE_LIB}/Agent.jar ] && [ -f ${INTROSCOPE_AGENTPROFILE} ]; then
-        JAVA_OPTS="${JAVA_OPTS} -javaagent:${INTROSCOPE_LIB}/Agent.jar -noverify -Dcom.wily.introscope.agentProfile=${INTROSCOPE_AGENTPROFILE} -Dintroscope.agent.agentName=schema-service"
-fi
 JAVA_OPTS="${JAVA_OPTS} -Dserver.port=${SERVER_PORT}";
 JAVA_OPTS="${JAVA_OPTS} -DBUNDLECONFIG_DIR=./resources";
 JAVA_OPTS="${JAVA_OPTS} -Dserver.local.startpath=${RESOURCES_HOME}";