summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Reehil <william.reehil@att.com>2021-02-16 15:03:30 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-16 15:03:30 +0000
commitd916436fdd637f5d18f2a625c66992a94fed1493 (patch)
treea23e29b1a43500cb7f63852a99356155b560ec9b
parent751a55972121777e400f25248096586161edd556 (diff)
parent3f5740cbf3e0ea4f0837ea0e15fbbadf943a1364 (diff)
Merge "Remove tini as onap wants one process per container"
-rw-r--r--aai-schema-service/src/main/docker/Dockerfile2
-rw-r--r--aai-schema-service/src/main/docker/docker-entrypoint.sh7
2 files changed, 1 insertions, 8 deletions
diff --git a/aai-schema-service/src/main/docker/Dockerfile b/aai-schema-service/src/main/docker/Dockerfile
index 6efa8d1..ab0bd08 100644
--- a/aai-schema-service/src/main/docker/Dockerfile
+++ b/aai-schema-service/src/main/docker/Dockerfile
@@ -9,7 +9,7 @@ EXPOSE 8447
HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8452 || exit 1
-ENTRYPOINT ["/sbin/tini", "--", "/bin/bash", "/opt/app/aai-schema-service/docker-entrypoint.sh"]
+ENTRYPOINT ["/bin/bash", "/opt/app/aai-schema-service/docker-entrypoint.sh"]
VOLUME /tmp
VOLUME /opt/tools
diff --git a/aai-schema-service/src/main/docker/docker-entrypoint.sh b/aai-schema-service/src/main/docker/docker-entrypoint.sh
index 1f33bdd..74d953e 100644
--- a/aai-schema-service/src/main/docker/docker-entrypoint.sh
+++ b/aai-schema-service/src/main/docker/docker-entrypoint.sh
@@ -28,13 +28,6 @@ if [[ ! -h "${APP_HOME}/scripts" ]]; then
ln -s ${APP_HOME}/bin ${APP_HOME}/scripts;
ln -s /opt/aai/logroot/AAI-SS ${APP_HOME}/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;
-
fi
scriptName=$1;