From 177eccda5ad8ba491e1ef6d337ca7a06bd5ff533 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 24 Feb 2021 11:22:32 -0500 Subject: Use latest base image version Update ccsdk/apps containers to use latest version of base CCSDK alpine image Change-Id: I76c435ee939a21640c8d73f75644059497da3084 Issue-ID: CCSDK-3179 Signed-off-by: Dan Timoney --- ms/neng/pom.xml | 2 ++ ms/neng/src/main/docker/Dockerfile | 3 ++- ms/sliboot/pom.xml | 6 ++++-- ms/sliboot/src/main/docker/Dockerfile | 8 +++++--- ms/vlantag-api/pom.xml | 3 +++ ms/vlantag-api/src/main/docker/Dockerfile | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) (limited to 'ms') diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 2488be60..73cf3453 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -47,6 +47,8 @@ deploy true ${project.version} + onap/ccsdk-alpine-j11-image + 1.1.1 onap/ccsdk-apps-ms-neng ${maven.build.timestamp} yyyyMMddHHmmss diff --git a/ms/neng/src/main/docker/Dockerfile b/ms/neng/src/main/docker/Dockerfile index 6f42eaec..ec161d3f 100644 --- a/ms/neng/src/main/docker/Dockerfile +++ b/ms/neng/src/main/docker/Dockerfile @@ -20,7 +20,8 @@ # Docker setup for the micro-service #================================================================================ #FROM onap/ccsdk-ubuntu-image:0.3.0-SNAPSHOT -FROM anapsix/alpine-java:8_jdk +FROM @base.image.name@:@base.image.version@ +USER root RUN apk add --no-cache curl diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml index ad81b6de..3859bf8b 100644 --- a/ms/sliboot/pom.xml +++ b/ms/sliboot/pom.xml @@ -20,8 +20,8 @@ org.onap.ccsdk.apps.ms.sliboot.SlibootApp 1.5.0 2.1.13 - onap/ccsdk-alpine-image - 1.1-STAGING-latest + onap/ccsdk-alpine-j11-image + 1.1.1 onap/ccsdk-sliboot-alpine-image ${project.version} 1.1.0 @@ -31,6 +31,8 @@ deploy true true + /opt/java/openjdk + ${java.home}/lib/security diff --git a/ms/sliboot/src/main/docker/Dockerfile b/ms/sliboot/src/main/docker/Dockerfile index 08529859..acd092f7 100644 --- a/ms/sliboot/src/main/docker/Dockerfile +++ b/ms/sliboot/src/main/docker/Dockerfile @@ -1,8 +1,8 @@ # Prepare stage for multistage image build ## START OF STAGE0 ## FROM @base.image.name@:@base.image.version@ AS stage0 +USER root -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV LOG_PATH /var/log/onap/ccsdk @@ -13,17 +13,19 @@ COPY opt /opt FROM @base.image.name@:@base.image.version@ +USER root MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV PROJECT_VERSION @project.version@ -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV CCSDK_HOME /opt/onap/ccsdk ENV CCSDK_CONFIG_DIR /opt/onap/ccsdk/config ENV SLIBOOT_JAR @ccsdk.sliboot.jar@ ENV SVCLOGIC_PROPERTIES /opt/onap/ccsdk/config/svclogic.properties ENV SVCLOGIC_DIR /opt/onap/ccsdk/svclogic/graphs ENV LOG_PATH /var/log/onap/ccsdk +ENV JAVA_HOME @java.home@ +ENV JAVA_SECURITY_DIR @java.security.dir@ # Install sudo and IP utilities RUN apk update && apk --no-cache add sudo iputils openssl @@ -42,7 +44,7 @@ RUN chmod +x ${CCSDK_HOME}/bin/*.sh # Install ssl and java certificates COPY $CCSDK_CONFIG_DIR/truststoreONAPall.jks $JAVA_SECURITY_DIR -RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit +RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit -noprompt ; fi USER sli diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml index 869a2e2c..766ec390 100644 --- a/ms/vlantag-api/pom.xml +++ b/ms/vlantag-api/pom.xml @@ -25,6 +25,9 @@ true ${project.version} ${maven.build.timestamp} + + onap/ccsdk-alpine-j11-image + 1.1.1 diff --git a/ms/vlantag-api/src/main/docker/Dockerfile b/ms/vlantag-api/src/main/docker/Dockerfile index 8b7e6153..cfcaba75 100644 --- a/ms/vlantag-api/src/main/docker/Dockerfile +++ b/ms/vlantag-api/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8_jdk +FROM @base.image.name@:@base.image.version@ ADD vlantag-api-0.3.0-SNAPSHOT.jar app.jar ADD startService.sh /startService.sh RUN chmod 700 /startService.sh -- cgit 1.2.3-korg