diff options
author | KAPIL SINGAL <ks220y@att.com> | 2020-02-18 16:47:19 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-02-18 16:47:19 +0000 |
commit | ec47175357058d256e625bf120d152dbd49b54be (patch) | |
tree | b1b91c8fcf26e7c84b17a2050b02f4ae0e20156d /ms/blueprintsprocessor/application/src/main/docker | |
parent | 6ed2cdca58d2d70ce07594bd9ee253f62d90af4c (diff) | |
parent | aa7eeb999f1fcb7edc190fbcefe9747fc6e63059 (diff) |
Merge "Removed manual shutdown hook for hazelcast"
Diffstat (limited to 'ms/blueprintsprocessor/application/src/main/docker')
-rwxr-xr-x | ms/blueprintsprocessor/application/src/main/docker/Dockerfile | 13 | ||||
-rw-r--r-- | ms/blueprintsprocessor/application/src/main/docker/startService.sh | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile index 2a85f1c95..1035915f1 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile @@ -1,3 +1,10 @@ +FROM alpine:latest AS extractor +COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz +RUN tar -xzf /source.tar.gz -C /tmp \ + && cp -rf /tmp/@project.build.finalName@/opt / \ + && rm -rf /source.tar.gz \ + && rm -rf /tmp/@project.build.finalName@ + FROM omahoco1/alpine-java-python # add entrypoint @@ -5,10 +12,6 @@ COPY startService.sh /startService.sh RUN chmod 777 /startService.sh && dos2unix /startService.sh # add application -COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz -RUN tar -xzf /source.tar.gz -C /tmp \ - && cp -rf /tmp/@project.build.finalName@/opt / \ - && rm -rf /source.tar.gz \ - && rm -rf /tmp/@project.build.finalName@ +COPY --from=extractor /opt /opt ENTRYPOINT [ "/startService.sh" ] diff --git a/ms/blueprintsprocessor/application/src/main/docker/startService.sh b/ms/blueprintsprocessor/application/src/main/docker/startService.sh index a9d3992a2..fb44ffd1c 100644 --- a/ms/blueprintsprocessor/application/src/main/docker/startService.sh +++ b/ms/blueprintsprocessor/application/src/main/docker/startService.sh @@ -18,4 +18,6 @@ exec java -classpath "/etc:${APP_HOME}/lib/*:/lib/*:/src:/schema:/generated-sour -Djava.security.egd=file:/dev/./urandom \ -DAPPNAME=${APP_NAME} -DAPPENV=${APP_ENV} -DAPPVERSION=${APP_VERSION} -DNAMESPACE=${NAMESPACE} \ -Dspring.config.location=${APP_CONFIG_HOME}/ \ +-Dhazelcast.shutdownhook.policy=GRACEFUL \ +-Dhazelcast.graceful.shutdown.max.wait=600 \ org.onap.ccsdk.cds.blueprintsprocessor.BlueprintProcessorApplicationKt |