extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-28 18:53:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated OpenJDK to 17 version

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-09-20 18:13:10 +09:00
parent e60973a136
commit cb73c5f897
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/build-base/alpine/Dockerfile
View File

@ -38,13 +38,13 @@ RUN set -eux && \
patch \ patch \
pcre2-dev \ pcre2-dev \
postgresql-dev \ postgresql-dev \
openjdk8 \ openjdk17 \
gettext \ gettext \
git \ git \
g++ \ g++ \
go \ go \
make \ make \
openjdk8-jre-base \ openjdk17-jre-headless \
unixodbc-dev" && \ unixodbc-dev" && \
apk add \ apk add \
--no-cache \ --no-cache \

2
Dockerfiles/build-base/centos/Dockerfile
View File

@ -39,7 +39,7 @@ RUN set -eux && \
openldap-devel \ openldap-devel \
sqlite-devel \ sqlite-devel \
postgresql-devel \ postgresql-devel \
java-1.8.0-openjdk-devel \ java-17-openjdk-devel \
git \ git \
gettext \ gettext \
go-toolset \ go-toolset \

2
Dockerfiles/build-base/ol/Dockerfile
View File

@ -38,7 +38,7 @@ RUN set -eux && \
openldap-devel \ openldap-devel \
sqlite-devel \ sqlite-devel \
postgresql-server-devel \ postgresql-server-devel \
java-1.8.0-openjdk-devel \ java-17-openjdk-devel \
git \ git \
gettext \ gettext \
unixODBC-devel" && \ unixODBC-devel" && \

2
Dockerfiles/build-base/rhel/Dockerfile
View File

@ -50,7 +50,7 @@ RUN set -eux && \
openldap-devel \ openldap-devel \
sqlite-devel \ sqlite-devel \
postgresql-devel \ postgresql-devel \
java-1.8.0-openjdk-devel \ java-17-openjdk-devel \
git \ git \
gettext \ gettext \
unixODBC-devel" && \ unixODBC-devel" && \

2
Dockerfiles/build-base/ubuntu/Dockerfile
View File

@ -38,7 +38,7 @@ RUN set -eux && \
libssh-dev \ libssh-dev \
libxml2-dev \ libxml2-dev \
make \ make \
openjdk-8-jdk-headless \ openjdk-17-jdk-headless \
patch \ patch \
pkg-config \ pkg-config \
gettext \ gettext \

2
Dockerfiles/java-gateway/alpine/Dockerfile
View File

@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi
RUN set -eux && \ RUN set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
openjdk8-jre-base" && \ openjdk17-jre-headless" && \
apk add \ apk add \
--no-cache \ --no-cache \
--clean-protected \ --clean-protected \

2
Dockerfiles/java-gateway/centos/Dockerfile
View File

@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi
RUN set -eux && \ RUN set -eux && \
REPOLIST="baseos,appstream" && \ REPOLIST="baseos,appstream" && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
java-1.8.0-openjdk-headless \ java-17-openjdk-headless \
findutils" && \ findutils" && \
dnf -y install \ dnf -y install \
--disablerepo "*" \ --disablerepo "*" \

2
Dockerfiles/java-gateway/ol/Dockerfile
View File

@ -31,7 +31,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi
RUN set -eux && \ RUN set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
java-1.8.0-openjdk-headless \ java-17-openjdk-headless \
findutils" && \ findutils" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \

2
Dockerfiles/java-gateway/rhel/Dockerfile
View File

@ -52,7 +52,7 @@ RUN set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
findutils \ findutils \
shadow-utils \ shadow-utils \
java-1.8.0-openjdk-headless" && \ java-17-openjdk-headless" && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \ --enablerepo "ubi-9-baseos-rpms" \

2
Dockerfiles/java-gateway/ubuntu/Dockerfile
View File

@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbi
RUN set -eux && \ RUN set -eux && \
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
openjdk-8-jre-headless" && \ openjdk-17-jre-headless" && \
apt-get -y update && \ apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y \ DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install \ --no-install-recommends install \