From 63ba2e3b19ab7b4cdf51f692af4af8462c3c751a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 20 Sep 2023 18:13:10 +0900 Subject: [PATCH] Updated OpenJDK to 17 version --- Dockerfiles/build-base/alpine/Dockerfile | 4 ++-- Dockerfiles/build-base/centos/Dockerfile | 2 +- Dockerfiles/build-base/ol/Dockerfile | 2 +- Dockerfiles/build-base/rhel/Dockerfile | 2 +- Dockerfiles/build-base/ubuntu/Dockerfile | 2 +- Dockerfiles/java-gateway/alpine/Dockerfile | 2 +- Dockerfiles/java-gateway/centos/Dockerfile | 2 +- Dockerfiles/java-gateway/ol/Dockerfile | 2 +- Dockerfiles/java-gateway/rhel/Dockerfile | 2 +- Dockerfiles/java-gateway/ubuntu/Dockerfile | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 04adebbf9..6613bcd8a 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -38,13 +38,13 @@ RUN set -eux && \ patch \ pcre2-dev \ postgresql-dev \ - openjdk8 \ + openjdk17 \ gettext \ git \ g++ \ go \ make \ - openjdk8-jre-base \ + openjdk17-jre-headless \ unixodbc-dev" && \ apk add \ --no-cache \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index bc1502337..54acbf42f 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -38,7 +38,7 @@ RUN set -eux && \ openldap-devel \ sqlite-devel \ postgresql-devel \ - java-1.8.0-openjdk-devel \ + java-17-openjdk-devel \ git \ gettext \ go-toolset \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index a038a271b..9a10bd6b7 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -38,7 +38,7 @@ RUN set -eux && \ openldap-devel \ sqlite-devel \ postgresql-server-devel \ - java-1.8.0-openjdk-devel \ + java-17-openjdk-devel \ git \ gettext \ unixODBC-devel" && \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 65ee72ac0..14668a06a 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ openldap-devel \ sqlite-devel \ postgresql-devel \ - java-1.8.0-openjdk-devel \ + java-17-openjdk-devel \ git \ gettext \ unixODBC-devel" && \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index b39791ca8..92de078bf 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -38,7 +38,7 @@ RUN set -eux && \ libssh-dev \ libxml2-dev \ make \ - openjdk-8-jdk-headless \ + openjdk-17-jdk-headless \ patch \ pkg-config \ gettext \ diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 35a9f6147..46b75689e 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi RUN set -eux && \ INSTALL_PKGS="bash \ - openjdk8-jre-base" && \ + openjdk17-jre-headless" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index b5e7136d7..47d258d98 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi RUN set -eux && \ REPOLIST="baseos,appstream" && \ INSTALL_PKGS="bash \ - java-1.8.0-openjdk-headless \ + java-17-openjdk-headless \ findutils" && \ dnf -y install \ --disablerepo "*" \ diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile index 2f636b744..f058f42a8 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -31,7 +31,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi RUN set -eux && \ INSTALL_PKGS="bash \ - java-1.8.0-openjdk-headless \ + java-17-openjdk-headless \ findutils" && \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 0e642bbb9..213128585 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -52,7 +52,7 @@ RUN set -eux && \ INSTALL_PKGS="bash \ findutils \ shadow-utils \ - java-1.8.0-openjdk-headless" && \ + java-17-openjdk-headless" && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \ diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 749742c5d..aa49b693d 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - openjdk-8-jre-headless" && \ + openjdk-17-jre-headless" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \