From 408cd42086aa968374c7ebb1d9125a93d7a0a10c Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Thu, 12 Jan 2023 12:18:31 +0100 Subject: prepare dist for chlorine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add java17 base image. switch chlorine to j17 Issue-ID: CCSDK-3832 Signed-off-by: Michael Dürre Change-Id: Ib2f3fd216eac4743a338299385e6bdbe52485275 Signed-off-by: Michael Dürre --- alpine/java11/pom.xml | 6 +- alpine/java17/pom.xml | 116 +++++++++++++++++++++ alpine/java17/src/main/docker/Dockerfile | 19 ++++ alpine/pom.xml | 1 + opendaylight/chlorine/chlorine-alpine/pom.xml | 8 +- .../chlorine-alpine/src/main/docker/Dockerfile | 2 +- 6 files changed, 144 insertions(+), 8 deletions(-) create mode 100644 alpine/java17/pom.xml create mode 100644 alpine/java17/src/main/docker/Dockerfile diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 3c734616..dbb640e2 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -26,9 +26,9 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml new file mode 100644 index 00000000..95e9bd19 --- /dev/null +++ b/alpine/java17/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-alpine-root + 1.5.0-SNAPSHOT + + + distribution-j17-alpine + pom + + ccsdk-distribution :: alpine :: java17 + Creates base alpine Docker container + + openECOMP + + + + onap/ccsdk-alpine-j17-image + eclipse-temurin + 17.0.4.1_1-jdk-alpine + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + validate + + execute + + + ${basedir}/../../src/main/scripts/TagVersion.groovy + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.34.0 + false + + + + ${image.name} + + try + true + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + ${docker.verbose} + ${docker.skip.push} + + + + build-push-images + + build + push + + + + + + + + + diff --git a/alpine/java17/src/main/docker/Dockerfile b/alpine/java17/src/main/docker/Dockerfile new file mode 100644 index 00000000..192d618b --- /dev/null +++ b/alpine/java17/src/main/docker/Dockerfile @@ -0,0 +1,19 @@ +# Base alpine with added packages needed for open ecomp +FROM ${base.image}:${base.image.version} +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +USER root + +ARG HTTP_PROXY +ARG HTTPS_PROXY + +ENV HTTP_PROXY ${HTTP_PROXY} +ENV http_proxy ${HTTP_PROXY} +ENV HTTPS_PROXY ${HTTPS_PROXY} +ENV https_proxy ${HTTPS_PROXY} + +ENV JAVA_HOME /opt/java/openjdk + +# Add tools needed for OpenDaylight +RUN apk update && apk --no-cache add sudo bash iputils openssl git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss + +USER onap diff --git a/alpine/pom.xml b/alpine/pom.xml index 6e61c9db..f99b3680 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -16,5 +16,6 @@ java11 + java17 diff --git a/opendaylight/chlorine/chlorine-alpine/pom.xml b/opendaylight/chlorine/chlorine-alpine/pom.xml index b490fcd9..0ea3598b 100644 --- a/opendaylight/chlorine/chlorine-alpine/pom.xml +++ b/opendaylight/chlorine/chlorine-alpine/pom.xml @@ -20,16 +20,16 @@ onap/ccsdk-odl-chlorine-alpine-image onap-karaf - 0.15.5 + 0.16.6 - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile b/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile index 15b17d80..45063110 100644 --- a/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile +++ b/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile @@ -1,6 +1,6 @@ # Prepare stage for multistage image build ## START OF STAGE0 ## -FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0 +FROM onap/ccsdk-alpine-j17-image:${project.docker.latestfulltag.version} AS stage0 USER root ENV ODL_HOME /opt/opendaylight/current -- cgit 1.2.3-korg