From 8c23129be8bef8f2113be25eca424f87eb05c889 Mon Sep 17 00:00:00 2001 From: Oleg Mitsura Date: Thu, 20 Aug 2020 09:47:26 -0400 Subject: JDK11 upgrade Issue-ID: CCSDK-1870 commit2: update surefire plugin to 3.0.0-M5. Need at least M3 for JDK11. S Still TODO: what to do about the spring-boot-parent. it may need a bump as well. commit3: update parent with surefire 3.0.0-M5 commit4: another surefire version update + failsafe version update. commit5: uncomment surefire def'n in parent pom. It may need to be redefined... commit6: update to parent 2.0.1-SNAPSHOT commits... rebasing/minorfixes commit14: disabling HealthCheckApplicationTests test commit19: Kapil bugfixes: Jsonfiles "isForce" replaces (incorrect) "force"; bumps kafka scala version to 2_13 commit20: fixe back kafka scala version to 2_11 commit25: reverted + applied patches for 2_13 (due to springboot parent update) + 'application' pom to use forCount=1 and reuseForks=false and reverted scanUatEmpoweredBlueprints modification in BluepritnsAcceptanceTest commit30: rebase commit31: SDCListener tests fixes. JMockit updated from 1.19 to 1.49. Since 1.42, need to do these changes https://jmockit.github.io/tutorial/Introduction.html#runningTests commit32: Dockerfiles cleanup. adduser/group params are different from Alpine. commit33: Dockerfile for SDClistener typo commit34: Addressed Dan's comments. commit35: Image was changed to 1.0.1 (which will be built soon), and the updated base image will already have 'onap' user and group, hence the adduser/group wouldn't be needed. commit36: rebase commit37: bumped up BP proc maven-surefire-plugin Xmx Signed-off-by: Oleg Mitsura Change-Id: I3d864d500150e7d81bb2ce73333f2db67c004e93 --- .../application/src/main/docker/Dockerfile | 16 +++++++--------- .../application/src/main/docker/startService.sh | 0 2 files changed, 7 insertions(+), 9 deletions(-) mode change 100644 => 100755 ms/blueprintsprocessor/application/src/main/docker/startService.sh (limited to 'ms/blueprintsprocessor/application/src/main/docker') diff --git a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile index e9c4c5895..751d6a5eb 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile @@ -5,20 +5,18 @@ RUN tar -xzf /source.tar.gz -C /tmp \ && rm -rf /source.tar.gz \ && rm -rf /tmp/@project.build.finalName@ -FROM omahoco1/alpine-java-python - +FROM onap/ccsdk-alpine-j11-image:1.0.1 +USER root # add entrypoint COPY startService.sh /startService.sh -RUN addgroup -S -g 1000 onap && adduser -u 1000 -S onap -G onap -RUN chown onap:onap /startService.sh -RUN touch /velocity.log && chmod 777 /velocity.log -RUN chown onap:onap /velocity.log -RUN chmod 777 /startService.sh && dos2unix /startService.sh +RUN chown onap:onap /startService.sh \ + && touch /velocity.log && chmod 755 /velocity.log && chown onap:onap /velocity.log \ + && chmod 755 /startService.sh +# dos2unix /startService.sh is redundant. Pls fix your git settings! # add application COPY --from=extractor /opt /opt -RUN mkdir -p /opt/app/onap/blueprints/deploy -RUN chown onap:onap /opt -R +RUN mkdir -p /opt/app/onap/blueprints/deploy && chown onap:onap /opt -R USER onap ENTRYPOINT [ "/startService.sh" ] diff --git a/ms/blueprintsprocessor/application/src/main/docker/startService.sh b/ms/blueprintsprocessor/application/src/main/docker/startService.sh old mode 100644 new mode 100755 -- cgit 1.2.3-korg