From f3799ed65ff87768e5703ed00ff31407cae407d7 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Tue, 18 Jul 2023 12:04:20 +0100 Subject: Create Java 17 base images. Issue-ID: POLICY-4667 Change-Id: I4133b1f445a4c8ec64173310cf236befa34f6be5 Signed-off-by: adheli.tavares --- .gitreview | 2 +- policy-db-migrator/src/main/docker/Dockerfile | 4 ++-- policy-jdk/alpine/src/main/docker/Dockerfile | 6 +++--- policy-jre/alpine/src/main/docker/Dockerfile | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitreview b/.gitreview index 59363eb9..a0385272 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.onap.org port=29418 project=policy/docker.git -defaultbranch=master +defaultbranch=java-17 diff --git a/policy-db-migrator/src/main/docker/Dockerfile b/policy-db-migrator/src/main/docker/Dockerfile index 7118c35a..c2197bdf 100644 --- a/policy-db-migrator/src/main/docker/Dockerfile +++ b/policy-db-migrator/src/main/docker/Dockerfile @@ -18,7 +18,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- -FROM onap/policy-jre-alpine:2.6.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.0.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy db-migrator" @@ -30,7 +30,7 @@ LABEL org.opencontainers.image.created="${git.build.time}" LABEL org.opencontainers.image.version="${git.build.version}" LABEL org.opencontainers.image.revision="${git.commit.id.abbrev}" -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk ENV POLICY_ETC /opt/app/policy/etc ENV POLICY_PROFILE /opt/app/policy/etc/profile.d ENV POLICY_BIN /opt/app/policy/bin diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index ab856bf4..3ad3a9bb 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -18,11 +18,11 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -FROM alpine:3.17 +FROM alpine:3.18.2 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy JRE Alpine" -LABEL org.opencontainers.image.description="Policy Java 11 JRE image based on Alpine" +LABEL org.opencontainers.image.description="Policy Java 17 JRE image based on Alpine" LABEL org.opencontainers.image.url="https://github.com/onap/policy-docker" LABEL org.opencontainers.image.vendor="ONAP Policy Team" LABEL org.opencontainers.image.licenses="Apache-2.0" @@ -48,7 +48,7 @@ RUN apk add --no-cache \ libretls \ musl-locales \ musl-locales-lang \ - openjdk11-jdk \ + openjdk17-jdk \ openssl \ ca-certificates && \ rm -rf /var/cache/apk/* && \ diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile index f1bf2496..cdbfd83c 100644 --- a/policy-jre/alpine/src/main/docker/Dockerfile +++ b/policy-jre/alpine/src/main/docker/Dockerfile @@ -18,11 +18,11 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -FROM alpine:3.17 +FROM alpine:3.18.2 LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy JRE Alpine" -LABEL org.opencontainers.image.description="Policy Java 11 JRE image based on Alpine" +LABEL org.opencontainers.image.description="Policy Java 17 JRE image based on Alpine" LABEL org.opencontainers.image.url="https://github.com/onap/policy-docker" LABEL org.opencontainers.image.vendor="ONAP Policy Team" LABEL org.opencontainers.image.licenses="Apache-2.0" @@ -47,7 +47,7 @@ RUN apk add --no-cache \ libretls \ musl-locales \ musl-locales-lang \ - openjdk11-jre \ + openjdk17-jre \ openssl \ ca-certificates && \ rm -rf /var/cache/apk/* && \ -- cgit 1.2.3-korg