diff --git a/.env b/.env index 863306259..fb8a1467f 100644 --- a/.env +++ b/.env @@ -80,7 +80,7 @@ RESTART_POLICY=unless-stopped # Cache base images ALPINE_BASE_IMAGE=alpine:3.22 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 RHEL_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0 diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index ea1d1ffd2..5ebf8be1d 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -1,5 +1,5 @@ # 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 ZBX_VERSION=${MAJOR_VERSION}.0 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/general/bin/*", "/usr/bin/"] 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/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ @@ -44,14 +44,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ iputils \ pcre2 \ libcurl \ - libmodbus \ +# libmodbus \ openssl-libs \ zlib" && \ microdnf -y install \ --disablerepo="*" \ - --enablerepo="ol9_baseos_latest" \ - --enablerepo="ol9_appstream" \ - --enablerepo="ol9_developer_EPEL" \ + --enablerepo="ol10_baseos_latest" \ + --enablerepo="ol10_appstream" \ + --enablerepo="ol10_u0_developer_EPEL" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ --best \ diff --git a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo new file mode 100644 index 000000000..66a0291c6 --- /dev/null +++ b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo @@ -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 diff --git a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo deleted file mode 100644 index 7fa64dc11..000000000 --- a/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo +++ /dev/null @@ -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 diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index 346b88f54..e6e25b720 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -1,5 +1,5 @@ # 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 ZBX_VERSION=${MAJOR_VERSION}.0 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/general/bin/*", "/usr/bin/"] 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/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ @@ -49,9 +49,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl-libs" && \ microdnf -y install \ --disablerepo="*" \ - --enablerepo="ol9_baseos_latest" \ - --enablerepo="ol9_appstream" \ - --enablerepo="ol9_developer_EPEL" \ + --enablerepo="ol10_baseos_latest" \ + --enablerepo="ol10_appstream" \ + --enablerepo="ol10_u0_developer_EPEL" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ --best \ diff --git a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo new file mode 100644 index 000000000..66a0291c6 --- /dev/null +++ b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol10.repo @@ -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 diff --git a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo deleted file mode 100644 index 7fa64dc11..000000000 --- a/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo +++ /dev/null @@ -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 diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index dbd893452..8fa822a2c 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -1,5 +1,5 @@ # 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} ARG MAJOR_VERSION=7.4 @@ -18,7 +18,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov