From 43a40e17bdb36015d1f54835ec794c43ed41ba0a Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Tue, 18 Jul 2023 12:04:20 +0100 Subject: Java 17 Upgrade - change of snapshot versions - csit fixes - apk update for openjdk security updates Issue-ID: POLICY-4667 Change-Id: I0f1044b88db9573886e5c5a14ebabb098128b2f2 Signed-off-by: adheli.tavares --- policy-jdk/alpine/pom.xml | 3 +-- policy-jdk/alpine/src/main/docker/Dockerfile | 9 +++++---- policy-jdk/pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'policy-jdk') diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml index f8a3a829..7f9f84e2 100644 --- a/policy-jdk/alpine/pom.xml +++ b/policy-jdk/alpine/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.docker policy-jdk - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT pom @@ -45,7 +45,6 @@ org.codehaus.gmaven groovy-maven-plugin - 2.1.1 validate diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index ab856bf4..b0a73a9e 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" @@ -44,11 +44,12 @@ ARG group=onap ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' # Generic additions -RUN apk add --no-cache \ +RUN apk update && \ + 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-jdk/pom.xml b/policy-jdk/pom.xml index 8c150a6e..7d7d652f 100644 --- a/policy-jdk/pom.xml +++ b/policy-jdk/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.docker docker - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT policy-jdk -- cgit 1.2.3-korg