diff options
| author |   Sebastien Premont-Tendland <sebastien.premont@bell.ca> | 2020-02-17 11:14:02 -0500 |
|---|---|---|
| committer | Sebastien Premont-Tendland <sebastien.premont@bell.ca> | 2020-02-17 11:30:57 -0500 |
| commit | aa7eeb999f1fcb7edc190fbcefe9747fc6e63059 (patch) | |
| tree | a84dffc4fdde79555ae81602e6c1c69eb55a9768 /ms/blueprintsprocessor/application/src/main/docker | |
| parent | e0e8b14e106cff2dccc76e6edcc1a7ee6ffe10da (diff) | |
Removed manual shutdown hook for hazelcast
Shutdown hook for hazelcast are already working with spring boot. Just
changed the policy to GRACEFUL (default is TERMINATE). This allow
hazelcast to shutdown gracefully and recover from a rolling upgrade
Also updated the Dockerfile to use multi stage to reduce by ~200Mb
the docker image size.
Issue-ID: CCSDK-2011
Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Change-Id: I0034145c7acefa88ed8d16f23a29249c7225ace3
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 |