From 81f940d01df4aa72da11cbf1740213c4dead1f78 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 10 Jun 2021 13:06:36 -0400 Subject: [PATCH] Added Oracle Linux 8 images instead of CentOS 8 --- agent2/alpine/README.md | 22 ++++++++++++++++------ agent2/ol/README.md | 12 ++++++++++-- agent2/rhel/README.md | 22 ++++++++++++++++------ agent2/ubuntu/README.md | 22 ++++++++++++++++------ snmptraps/centos/Dockerfile | 8 ++++---- 5 files changed, 62 insertions(+), 24 deletions(-) diff --git a/agent2/alpine/README.md b/agent2/alpine/README.md index f47326c08..1e32848d1 100644 --- a/agent2/alpine/README.md +++ b/agent2/alpine/README.md @@ -18,11 +18,13 @@ These are the only official Zabbix agent 2 Docker images. They are based on Alpi Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported) Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported) - Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest) - Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*) - Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, alpine-latest, ubuntu-latest, latest) - Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*) - Zabbix agent 2 5.4 (tags: alpine-trunk, ubuntu-trunk) + Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix agent 2 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix agent 2 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix agent 2 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. @@ -186,6 +188,14 @@ This variant is highly recommended when final image size being as small as possi To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). +## `zabbix-agent:ubuntu-` + +This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. + +## `zabbix-agent:ol-` + +Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. + # Supported Docker versions This image is officially supported on Docker version 1.12.0. @@ -198,7 +208,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/4.4/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/5.0/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. ## Issues diff --git a/agent2/ol/README.md b/agent2/ol/README.md index 984203b69..1e32848d1 100644 --- a/agent2/ol/README.md +++ b/agent2/ol/README.md @@ -23,7 +23,7 @@ These are the only official Zabbix agent 2 Docker images. They are based on Alpi Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) Zabbix agent 2 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) - Zabbix agent 2 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix agent 2 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) Zabbix agent 2 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. @@ -188,6 +188,14 @@ This variant is highly recommended when final image size being as small as possi To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). +## `zabbix-agent:ubuntu-` + +This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. + +## `zabbix-agent:ol-` + +Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. + # Supported Docker versions This image is officially supported on Docker version 1.12.0. @@ -200,7 +208,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/4.4/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/5.0/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. ## Issues diff --git a/agent2/rhel/README.md b/agent2/rhel/README.md index f47326c08..1e32848d1 100644 --- a/agent2/rhel/README.md +++ b/agent2/rhel/README.md @@ -18,11 +18,13 @@ These are the only official Zabbix agent 2 Docker images. They are based on Alpi Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported) Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported) - Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest) - Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*) - Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, alpine-latest, ubuntu-latest, latest) - Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*) - Zabbix agent 2 5.4 (tags: alpine-trunk, ubuntu-trunk) + Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix agent 2 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix agent 2 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix agent 2 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. @@ -186,6 +188,14 @@ This variant is highly recommended when final image size being as small as possi To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). +## `zabbix-agent:ubuntu-` + +This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. + +## `zabbix-agent:ol-` + +Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. + # Supported Docker versions This image is officially supported on Docker version 1.12.0. @@ -198,7 +208,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/4.4/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/5.0/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. ## Issues diff --git a/agent2/ubuntu/README.md b/agent2/ubuntu/README.md index f47326c08..1e32848d1 100644 --- a/agent2/ubuntu/README.md +++ b/agent2/ubuntu/README.md @@ -18,11 +18,13 @@ These are the only official Zabbix agent 2 Docker images. They are based on Alpi Zabbix agent 2 4.4 (tags: alpine-4.4-latest) (unsupported) Zabbix agent 2 4.4.* (tags: alpine-4.4.*) (unsupported) - Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest) - Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*) - Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, alpine-latest, ubuntu-latest, latest) - Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*) - Zabbix agent 2 5.4 (tags: alpine-trunk, ubuntu-trunk) + Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix agent 2 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix agent 2 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix agent 2 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix agent 2 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix agent 2 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux. @@ -186,6 +188,14 @@ This variant is highly recommended when final image size being as small as possi To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). +## `zabbix-agent:ubuntu-` + +This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. + +## `zabbix-agent:ol-` + +Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more. + # Supported Docker versions This image is officially supported on Docker version 1.12.0. @@ -198,7 +208,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/4.4/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. +Documentation for this image is stored in the [`agent2/` directory](https://github.com/zabbix/zabbix-docker/tree/5.0/agent2) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request. ## Issues diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index 15cf526dc..d85ac5199 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -28,9 +28,9 @@ RUN set -eux && \ --shell /sbin/nologin \ --home-dir /var/lib/zabbix/ \ zabbix && \ - yum --quiet makecache && \ - yum -y install epel-release && \ - yum -y install --setopt=tsflags=nodocs \ + dnf --quiet makecache && \ + dnf -y install epel-release && \ + dnf -y install --setopt=tsflags=nodocs --setopt=install_weak_deps=False --best \ tzdata \ net-snmp && \ mkdir -p /var/lib/zabbix && \ @@ -40,7 +40,7 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/snmp/ /var/lib/zabbix/ /var/tmp/ /var/run/ && \ chgrp -R 0 /etc/snmp/ /var/lib/zabbix/ /var/tmp/ /var/run/ && \ chmod -R g=u /etc/snmp/ /var/lib/zabbix/ /var/tmp/ /var/run/ && \ - yum -y clean all && \ + dnf -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki