extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 00:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Oracle Linux 9 to 10

Browse Source
This commit is contained in:
Alexey Pustovalov
2025-07-04 10:37:03 +03:00
parent 24eec860fd
commit d6f0ef5997
42 changed files with 168 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -80,7 +80,7 @@ RESTART_POLICY=unless-stopped
# Cache base images # Cache base images
ALPINE_BASE_IMAGE=alpine:3.22 ALPINE_BASE_IMAGE=alpine:3.22
CENTOS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal CENTOS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
OL_BASE_IMAGE=oraclelinux:9-slim OL_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
UBUNTU_BASE_IMAGE=ubuntu:noble UBUNTU_BASE_IMAGE=ubuntu:noble
RHEL_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0 RHEL_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0

12
Dockerfiles/agent/ol/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -35,7 +35,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd", "/usr/sbin/zabbix_agentd"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd", "/usr/sbin/zabbix_agentd"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent/conf/", "${ZABBIX_CONF_DIR}/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -44,14 +44,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
iputils \ iputils \
pcre2 \ pcre2 \
libcurl \ libcurl \
libmodbus \ # libmodbus \
openssl-libs \ openssl-libs \
zlib" && \ zlib" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

6
Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo Normal file
View File

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

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

@ -1,6 +0,0 @@
[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/agent2/ol/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -35,7 +35,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/", "/usr/sbin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/", "/usr/sbin/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/", "${ZABBIX_CONF_DIR}/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -49,9 +49,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
openssl-libs" && \ openssl-libs" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

6
Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo Normal file
View File

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

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

@ -1,6 +0,0 @@
[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
Dockerfiles/build-base/ol/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
FROM ${OS_BASE_IMAGE} FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
@ -18,7 +18,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
org.opencontainers.image.vendor="Zabbix SIA" \ org.opencontainers.image.vendor="Zabbix SIA" \
org.opencontainers.image.version="${ZBX_VERSION}" org.opencontainers.image.version="${ZBX_VERSION}"
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -33,35 +33,29 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
libcurl-devel \ libcurl-devel \
libevent-devel \ libevent-devel \
libssh-devel \ libssh-devel \
libmodbus-devel \ # libmodbus-devel \
libxml2-devel \ libxml2-devel \
openssl-devel \ openssl-devel \
openldap-devel \ openldap-devel \
make \ make \
mysql-devel \ mysql8.4-devel \
net-snmp-devel \ net-snmp-devel \
OpenIPMI-devel \ OpenIPMI-devel \
openldap-devel \ openldap-devel \
sqlite-devel \ sqlite-devel \
postgresql-private-devel \ postgresql-private-devel \
postgresql-server-devel \ postgresql-server-devel \
java-17-openjdk-devel \ java-21-openjdk-devel \
git \ git \
gettext \ gettext \
unixODBC-devel \ unixODBC-devel \
zlib-devel" && \ zlib-devel" && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol9_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
postgresql:16 && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "ol9_baseos_latest" \ --enablerepo "ol10_baseos_latest" \
--enablerepo "ol9_appstream" \ --enablerepo "ol10_appstream" \
--enablerepo "ol9_codeready_builder" \ --enablerepo "ol10_codeready_builder" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

6
Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo Normal file
View File

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

6
Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo
View File

@ -1,6 +0,0 @@
[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

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

@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--enable-webservice \ --enable-webservice \
--with-ldap \ --with-ldap \
--with-libcurl \ --with-libcurl \
--with-libmodbus \ # --with-libmodbus \
--with-libpcre2 \ --with-libpcre2 \
--with-libxml2 \ --with-libxml2 \
--with-${DB_TYPE} \ --with-${DB_TYPE} \

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

@ -88,7 +88,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--enable-webservice \ --enable-webservice \
--with-ldap \ --with-ldap \
--with-libcurl \ --with-libcurl \
--with-libmodbus \ # --with-libmodbus \
--with-libpcre2 \ --with-libpcre2 \
--with-libxml2 \ --with-libxml2 \
--with-${DB_TYPE} \ --with-${DB_TYPE} \

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

@ -78,7 +78,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--enable-proxy \ --enable-proxy \
--with-ldap \ --with-ldap \
--with-libcurl \ --with-libcurl \
--with-libmodbus \ # --with-libmodbus \
--with-libpcre2 \ --with-libpcre2 \
--with-libxml2 \ --with-libxml2 \
--with-${DB_TYPE} \ --with-${DB_TYPE} \

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -35,12 +35,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
set -eux && \ set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
java-17-openjdk-headless \ java-21-openjdk-headless \
findutils" && \ findutils" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -44,7 +44,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy"
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "${ZABBIX_CONF_DIR}/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/", "/usr/share/doc/zabbix-proxy-mysql/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/", "/usr/share/doc/zabbix-proxy-mysql/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -59,8 +59,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
fping \ fping \
iputils \ iputils \
libxml2 \ libxml2 \
mysql \ mysql8.4 \
mysql-libs \ mysql8.4-libs \
net-snmp-libs \ net-snmp-libs \
OpenIPMI-libs \ OpenIPMI-libs \
openldap \ openldap \
@ -72,10 +72,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
unixODBC" && \ unixODBC" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_codeready_builder" \ --enablerepo="ol10_codeready_builder" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

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

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

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

@ -1,6 +0,0 @@
[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/proxy-sqlite3/ol/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
@ -42,7 +42,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy", "/usr/sbin/zabbix_proxy"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/sbin/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/proxy/conf/", "${ZABBIX_CONF_DIR}/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/", "/usr/bin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/", "/usr/bin/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -67,9 +67,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
unixODBC" && \ unixODBC" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

6
Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo Normal file
View File

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

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

@ -1,6 +0,0 @@
[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

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -44,7 +44,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_serve
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/create.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -61,8 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
libevent \ libevent \
libxml2 \ libxml2 \
libssh \ libssh \
mysql \ mysql8.4 \
mysql-libs \ mysql8.4-libs \
net-snmp-libs \ net-snmp-libs \
OpenIPMI-libs \ OpenIPMI-libs \
openldap \ openldap \
@ -74,10 +74,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
unixODBC" && \ unixODBC" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_codeready_builder" \ --enablerepo="ol10_codeready_builder" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
@ -44,7 +44,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/sbin/zabbix_serve
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/general/bin/*", "/usr/bin/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/conf/", "${ZABBIX_CONF_DIR}/"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/", "/usr/share/doc/zabbix-server-postgresql/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql/", "/usr/share/doc/zabbix-server-postgresql/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -72,18 +72,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
zlib \ zlib \
gzip \ gzip \
unixODBC" && \ unixODBC" && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol9_baseos_latest" \
--enablerepo "ol9_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
postgresql:16 && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
FROM ${OS_BASE_IMAGE} FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
@ -33,8 +33,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
net-snmp" && \ net-snmp" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -32,15 +32,16 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"]
COPY ["conf/etc/", "/etc/"] COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
set -eux && \ set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
curl \ curl \
gzip \
httpd \ httpd \
mysql \ mysql8.4 \
mod_ssl \ mod_ssl \
php \ php \
php-curl \ php-curl \
@ -55,17 +56,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
supervisor" && \ supervisor" && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol9_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
@ -118,7 +113,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
chmod -R g=u /run/httpd/ /var/lib/php/session/ && \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source glibc-locale-source \
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -32,13 +32,14 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"]
COPY ["conf/etc/", "/etc/"] COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
set -eux && \ set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
curl \ curl \
gzip \
httpd \ httpd \
mod_ssl \ mod_ssl \
php \ php \
@ -55,18 +56,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
supervisor" && \ supervisor" && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol9_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
postgresql:16 && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
@ -119,7 +113,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
chmod -R g=u /run/httpd/ /var/lib/php/session/ && \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source glibc-locale-source \
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -32,14 +32,15 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"]
COPY ["conf/etc/", "/etc/"] COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
set -eux && \ set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
curl \ curl \
mysql \ gzip \
mysql8.4 \
nginx \ nginx \
php-bcmath \ php-bcmath \
php-curl \ php-curl \
@ -53,18 +54,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
supervisor" && \ supervisor" && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol9_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
nginx:1.24 && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
@ -114,7 +108,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source glibc-locale-source \
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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

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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
@ -32,13 +32,14 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "${ZABBIX_WWW_ROOT}"]
COPY ["conf/etc/", "/etc/"] COPY ["conf/etc/", "/etc/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
set -eux && \ set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
curl \ curl \
gzip \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
nginx \ nginx \
@ -53,19 +54,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-xml \ php-xml \
postgresql \ postgresql \
supervisor" && \ supervisor" && \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "ol9_appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
postgresql:16 \
nginx:1.24 && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
@ -115,7 +108,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source glibc-locale-source \
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=oraclelinux:9-slim ARG OS_BASE_IMAGE=container-registry.oracle.com/os/oraclelinux:10-slim
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
@ -32,7 +32,7 @@ STOPSIGNAL SIGTERM
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service", "/usr/sbin/zabbix_web_service"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service", "/usr/sbin/zabbix_web_service"]
COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/", "${ZABBIX_CONF_DIR}/"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/", "${ZABBIX_CONF_DIR}/"]
COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"] COPY ["conf/etc/yum.repos.d/oracle-epel-ol10.repo", "/etc/yum.repos.d/oracle-epel-ol10.repo"]
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -41,9 +41,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
chromium-headless" && \ chromium-headless" && \
microdnf -y install \ microdnf -y install \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="ol9_baseos_latest" \ --enablerepo="ol10_baseos_latest" \
--enablerepo="ol9_appstream" \ --enablerepo="ol10_appstream" \
--enablerepo="ol9_developer_EPEL" \ --enablerepo="ol10_u0_developer_EPEL" \
--setopt=install_weak_deps=0 \ --setopt=install_weak_deps=0 \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \

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

@ -0,0 +1,6 @@
[ol10_u0_developer_EPEL]
name=Oracle Linux $releasever.0 EPEL Packages for Development ($basearch)
baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/0/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
View File

@ -1,6 +0,0 @@
[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