diff options
| -rw-r--r-- | ms/neng/pom.xml | 2 | ||||
| -rw-r--r-- | ms/neng/src/main/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | ms/sliboot/pom.xml | 6 | ||||
| -rw-r--r-- | ms/sliboot/src/main/docker/Dockerfile | 8 | ||||
| -rw-r--r-- | ms/vlantag-api/pom.xml | 3 | ||||
| -rw-r--r-- | ms/vlantag-api/src/main/docker/Dockerfile | 2 |
6 files changed, 17 insertions, 7 deletions
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 @@ <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> <ccsdk.project.version>${project.version}</ccsdk.project.version> + <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name> + <base.image.version>1.1.1</base.image.version> <image.name>onap/ccsdk-apps-ms-neng</image.name> <timestamp>${maven.build.timestamp}</timestamp> <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format> 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 @@ <start-class>org.onap.ccsdk.apps.ms.sliboot.SlibootApp</start-class> <shiro.version>1.5.0</shiro.version> <aaf-shiro-bundle.version>2.1.13</aaf-shiro-bundle.version> - <base.image.name>onap/ccsdk-alpine-image</base.image.name> - <base.image.version>1.1-STAGING-latest</base.image.version> + <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name> + <base.image.version>1.1.1</base.image.version> <image.name>onap/ccsdk-sliboot-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.distribution.version>1.1.0</ccsdk.distribution.version> @@ -31,6 +31,8 @@ <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks> + <java.home>/opt/java/openjdk</java.home> + <java.security.dir>${java.home}/lib/security</java.security.dir> </properties> <dependencies> 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 @@ <docker.verbose>true</docker.verbose> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + + <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name> + <base.image.version>1.1.1</base.image.version> </properties> <parent> 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
|