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

Updated OL from 8 to 9 version

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-01-31 18:12:38 +09:00
parent 9871581d86
commit 59b52adb86
34 changed files with 143 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfiles/agent/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -30,7 +30,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd"
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get", "/usr/bin/zabbix_get"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender", "/usr/bin/zabbix_sender"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf", "/etc/zabbix/zabbix_agentd.conf"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -43,9 +43,9 @@ RUN set -eux && \
zlib" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

4
Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo → Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
View File

@ -1,6 +1,6 @@
[ol8_developer_EPEL]
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

10
Dockerfiles/agent2/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -35,7 +35,7 @@ COPY --from=builder ["/tmp/mongodb_plugin/mongodb.conf", "/etc/zabbix/zabbix_age
COPY --from=builder ["/tmp/postgresql_plugin/postgresql.conf", "/etc/zabbix/zabbix_agent2.d/plugins.d/postgresql.conf"]
COPY --from=builder ["/tmp/mongodb_plugin/zabbix-agent2-plugin-mongodb", "/usr/sbin/zabbix-agent2-plugin/zabbix-agent2-plugin-mongodb"]
COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", "/usr/sbin/zabbix-agent2-plugin/zabbix-agent2-plugin-postgresql"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -49,9 +49,9 @@ RUN set -eux && \
openssl-libs" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

4
Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo → Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
View File

@ -1,6 +1,6 @@
[ol8_developer_EPEL]
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION=6.4
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -37,18 +37,16 @@ RUN set -eux && \
OpenIPMI-devel \
openldap-devel \
sqlite-devel \
postgresql-devel \
postgresql-server-devel \
java-1.8.0-openjdk-devel \
git \
gettext \
unixODBC-devel" && \
microdnf -y module enable mysql && \
microdnf module enable postgresql:13 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol8_baseos_latest" \
--enablerepo "ol8_appstream" \
--enablerepo "ol8_codeready_builder" \
--enablerepo "ol9_baseos_latest" \
--enablerepo "ol9_appstream" \
--enablerepo "ol9_codeready_builder" \
--setopt=install_weak_deps=0 \
--best \
--nodocs ${INSTALL_PKGS} && \

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

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -35,8 +35,8 @@ RUN set -eux && \
findutils" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

12
Dockerfiles/proxy-mysql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get", "/u
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender", "/usr/bin/zabbix_sender"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql.gz", "/usr/share/doc/zabbix-proxy-mysql/create.sql.gz"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="libevent \
@ -54,12 +54,12 @@ RUN set -eux && \
pcre2 \
zlib \
unixODBC" && \
microdnf -y module enable mysql && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_codeready_builder" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

4
Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo → Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
View File

@ -1,6 +1,6 @@
[ol8_developer_EPEL]
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

10
Dockerfiles/proxy-sqlite3/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -31,7 +31,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy",
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get", "/usr/bin/zabbix_get"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender", "/usr/bin/zabbix_sender"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="libevent \
@ -53,9 +53,9 @@ RUN set -eux && \
unixODBC" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

4
Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo → Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
View File

@ -1,6 +1,6 @@
[ol8_developer_EPEL]
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

12
Dockerfiles/server-mysql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -32,7 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get", "/u
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender", "/usr/bin/zabbix_sender"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_server.conf", "/etc/zabbix/zabbix_server.conf"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -57,12 +57,12 @@ RUN set -eux && \
pcre2 \
zlib \
unixODBC" && \
microdnf -y module enable mysql && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_codeready_builder" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

11
Dockerfiles/server-pgsql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -33,7 +33,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_server.conf", "/etc/zabbix/zabbix_server.conf"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/create_server.sql.gz", "/usr/share/doc/zabbix-server-postgresql/create.sql.gz"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb.sql", "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="fping \
@ -57,12 +57,11 @@ RUN set -eux && \
postgresql-libs \
zlib \
unixODBC" && \
microdnf module enable postgresql:13 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/snmptraps/ol/Dockerfile
View File

@ -1,4 +1,4 @@
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION=6.4
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -26,8 +26,8 @@ RUN set -eux && \
net-snmp" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

12
Dockerfiles/web-apache-mysql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -48,13 +48,11 @@ RUN set -eux && \
findutils \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

12
Dockerfiles/web-apache-pgsql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -48,13 +48,11 @@ RUN set -eux && \
findutils \
glibc-locale-source \
supervisor" && \
microdnf -y module enable php:8.0 && \
microdnf module enable postgresql:13 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

12
Dockerfiles/web-nginx-mysql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -46,13 +46,11 @@ RUN set -eux && \
findutils \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

12
Dockerfiles/web-nginx-pgsql/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -28,7 +28,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
@ -46,13 +46,11 @@ RUN set -eux && \
php-xml \
postgresql \
supervisor" && \
microdnf -y module enable php:8.0 && \
microdnf module enable postgresql:13 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

10
Dockerfiles/web-service/ol/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
FROM oraclelinux:8-slim
FROM oraclelinux:9-slim
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -29,16 +29,16 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service", "/usr/sbin/zabbix_web_service"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf", "/etc/zabbix/zabbix_web_service.conf"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
RUN set -eux && \
INSTALL_PKGS="bash \
chromium-headless" && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
--enablerepo="ol9_baseos_latest" \
--enablerepo="ol9_appstream" \
--enablerepo="ol9_developer_EPEL" \
--setopt=install_weak_deps=0 \
--best \
--nodocs \

6
Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
View File

@ -1,6 +0,0 @@
[ol8_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

6
Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo Normal file
View File

@ -0,0 +1,6 @@
[ol9_developer_EPEL]
name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=0

24
docker-compose_v3_ol_mysql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build:
context: ./Dockerfiles/build-base/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
image: zabbix-build-base:ol-local
zabbix-build-mysql:
build:
context: ./Dockerfiles/build-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-base:ol-local
image: zabbix-build-mysql:ol-local
@ -22,7 +22,7 @@ services:
build:
context: ./Dockerfiles/build-sqlite3/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-base:ol-local
image: zabbix-build-sqlite3:ol-local
@ -35,7 +35,7 @@ services:
build:
context: ./Dockerfiles/server-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-server-mysql:ol-local
@ -107,7 +107,7 @@ services:
build:
context: ./Dockerfiles/proxy-sqlite3/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-sqlite3:ol-local
image: zabbix-proxy-sqlite3:ol-local
@ -163,7 +163,7 @@ services:
build:
context: ./Dockerfiles/proxy-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-proxy-mysql:ol-local
@ -229,7 +229,7 @@ services:
build:
context: ./Dockerfiles/web-apache-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-web-apache-mysql:ol-local
@ -292,7 +292,7 @@ services:
build:
context: ./Dockerfiles/web-nginx-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-web-nginx-mysql:ol-local
@ -353,7 +353,7 @@ services:
build:
context: ./Dockerfiles/agent/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-agent:ol-local
@ -401,7 +401,7 @@ services:
build:
context: ./Dockerfiles/java-gateway/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-java-gateway:ol-local
@ -438,7 +438,7 @@ services:
build:
context: ./Dockerfiles/snmptraps/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
image: zabbix-snmptraps:ol-local
profiles:
- full
@ -471,7 +471,7 @@ services:
build:
context: ./Dockerfiles/web-service/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-web-service:ol-local

26
docker-compose_v3_ol_pgsql_local.yaml
View File

@ -4,14 +4,14 @@ services:
build:
context: ./Dockerfiles/build-base/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
image: zabbix-build-base:ol-local
zabbix-build-pgsql:
build:
context: ./Dockerfiles/build-pgsql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-base:ol-local
image: zabbix-build-pgsql:ol-local
@ -22,7 +22,7 @@ services:
build:
context: ./Dockerfiles/build-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-base:ol-local
image: zabbix-build-mysql:ol-local
@ -35,7 +35,7 @@ services:
build:
context: ./Dockerfiles/build-sqlite3/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-base:ol-local
image: zabbix-build-sqlite3:ol-local
@ -48,7 +48,7 @@ services:
build:
context: ./Dockerfiles/server-pgsql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local
image: zabbix-server-pgsql:ol-local
@ -118,7 +118,7 @@ services:
build:
context: ./Dockerfiles/proxy-sqlite3/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-sqlite3:ol-local
image: zabbix-proxy-sqlite3:ol-local
@ -174,7 +174,7 @@ services:
build:
context: ./Dockerfiles/proxy-mysql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local
image: zabbix-proxy-mysql:ol-local
@ -237,7 +237,7 @@ services:
build:
context: ./Dockerfiles/web-apache-pgsql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local
image: zabbix-web-apache-pgsql:ol-local
@ -300,7 +300,7 @@ services:
build:
context: ./Dockerfiles/web-nginx-pgsql/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local
image: zabbix-web-nginx-pgsql:ol-local
@ -361,7 +361,7 @@ services:
build:
context: ./Dockerfiles/agent/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local
image: zabbix-agent:ol-local
@ -409,7 +409,7 @@ services:
build:
context: ./Dockerfiles/java-gateway/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local
image: zabbix-java-gateway:ol-local
@ -446,7 +446,7 @@ services:
build:
context: ./Dockerfiles/snmptraps/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
image: zabbix-snmptraps:ol-local
profiles:
- full
@ -479,7 +479,7 @@ services:
build:
context: ./Dockerfiles/web-service/ol
cache_from:
- oraclelinux:8-slim
- oraclelinux:9-slim
args:
BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local
image: zabbix-web-service:ol-local