diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 3de29ab43..09b7f6270 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -48,21 +48,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ shadow-utils \ zlib" && \ microdnf -y install \ - --disablerepo "*" \ - --enablerepo "extras-common" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs epel-release && \ + --disablerepo "*" \ + --enablerepo "extras-common" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + --best \ + --nodocs \ + epel-release && \ microdnf -y install \ - --disablerepo "*" \ - --enablerepo "baseos" \ - --enablerepo "appstream" \ - --enablerepo="epel" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - --best \ - --nodocs ${INSTALL_PKGS} && \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --enablerepo "appstream" \ + --enablerepo="epel" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + --best \ + --nodocs \ + ${INSTALL_PKGS} && \ microdnf -y reinstall \ --enablerepo "baseos" \ --setopt=install_weak_deps=0 \ diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index 9d7037ade..8c35e30cc 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -34,7 +34,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/sbin/zabbix_agentd / COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /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 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ @@ -47,6 +46,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ libmodbus \ openssl-libs \ zlib" && \ + microdnf -y install \ + --disablerepo "*" \ + --enablerepo "ol9_baseos_latest" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + --best \ + --nodocs \ + oracle-epel-release-el9 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ 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 c51df9a18..a5aabe3c4 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -35,7 +35,6 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/sbin/zabbix-agent2- COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_get /usr/bin/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/general/bin/zabbix_sender /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 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ @@ -47,6 +46,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ smartmontools \ sudo \ openssl-libs" && \ + microdnf -y install \ + --disablerepo "*" \ + --enablerepo "ol10_baseos_latest" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + --best \ + --nodocs \ + oracle-epel-release-el9 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ 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 811261adf..33621e97a 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -22,8 +22,6 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov