From 25e53111c4adf3b516edeed04b79635dfd736c1d Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 10 Jun 2021 14:16:01 -0400 Subject: [PATCH] Added Oracle Linux 8 images instead of CentOS 8 --- agent/ol/README.md | 28 +++++++++++++---------- agent/rhel/Dockerfile | 2 +- agent/rhel/README.md | 26 +++++++++++++--------- agent2/alpine/Dockerfile | 2 +- agent2/rhel/Dockerfile | 2 +- agent2/ubuntu/Dockerfile | 2 +- java-gateway/ol/README.md | 30 ++++++++++++++----------- java-gateway/rhel/Dockerfile | 2 +- java-gateway/rhel/README.md | 28 ++++++++++++++--------- proxy-mysql/ol/README.md | 28 +++++++++++++---------- proxy-mysql/rhel/Dockerfile | 2 +- proxy-mysql/rhel/README.md | 38 +++++++++++++++++++++----------- proxy-sqlite3/ol/README.md | 28 +++++++++++++---------- proxy-sqlite3/rhel/Dockerfile | 2 +- proxy-sqlite3/rhel/README.md | 27 ++++++++++++++--------- server-mysql/ol/README.md | 28 +++++++++++++---------- server-mysql/rhel/Dockerfile | 2 +- server-mysql/rhel/README.md | 30 ++++++++++++++++--------- server-pgsql/ol/README.md | 30 ++++++++++++++----------- snmptraps/ol/README.md | 34 ++++++++++++++-------------- web-apache-mysql/ol/README.md | 30 ++++++++++++++----------- web-apache-pgsql/ol/README.md | 30 ++++++++++++++----------- web-nginx-mysql/ol/README.md | 30 ++++++++++++++----------- web-nginx-mysql/rhel/Dockerfile | 2 +- web-nginx-mysql/rhel/README.md | 28 ++++++++++++++--------- web-nginx-pgsql/ol/Dockerfile | 2 +- web-nginx-pgsql/ol/README.md | 30 ++++++++++++++----------- zabbix-appliance/rhel/Dockerfile | 2 +- 28 files changed, 306 insertions(+), 219 deletions(-) diff --git a/agent/ol/README.md b/agent/ol/README.md index bc73ce13b..4cc642f18 100644 --- a/agent/ol/README.md +++ b/agent/ol/README.md @@ -28,13 +28,13 @@ These are the only official Zabbix agent Docker images. They are based on Alpine Zabbix agent 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix agent 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix agent 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest, ol-5.0-latest) - Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*, ol-5.0.*) - Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, ol-5.0-latest) - Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, ol-latest, latest) - Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*, ol-5.4.*) - Zabbix agent 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk, ol-trunk) + Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix agent 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. @@ -199,10 +199,6 @@ The volume is used to store TLS related files. These file names are specified us The `zabbix-agent` images come in many flavors, each designed for a specific use case. -## `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:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -211,6 +207,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. @@ -223,7 +227,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`agent/` directory](https://github.com/zabbix/zabbix-docker/tree/5.0/agent) 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 [`agent/` directory](https://github.com/zabbix/zabbix-docker/tree/3.0/agent) 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/agent/rhel/Dockerfile b/agent/rhel/Dockerfile index cc9b0a36f..e75a359fc 100644 --- a/agent/rhel/Dockerfile +++ b/agent/rhel/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/agent/rhel/README.md b/agent/rhel/README.md index 143597d19..4cc642f18 100644 --- a/agent/rhel/README.md +++ b/agent/rhel/README.md @@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour # Zabbix agent images -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix agent are: +These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix agent are: Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,11 +28,13 @@ These are the only official Zabbix agent Docker images. They are based on Alpine Zabbix agent 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix agent 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix agent 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix agent 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix agent 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix agent 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix agent 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix agent 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. @@ -197,10 +199,6 @@ The volume is used to store TLS related files. These file names are specified us The `zabbix-agent` images come in many flavors, each designed for a specific use case. -## `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:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -209,6 +207,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. diff --git a/agent2/alpine/Dockerfile b/agent2/alpine/Dockerfile index 78f563c49..e2586eb8c 100644 --- a/agent2/alpine/Dockerfile +++ b/agent2/alpine/Dockerfile @@ -56,7 +56,7 @@ RUN set -eux && \ openssl-dev \ zlib-dev && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ diff --git a/agent2/rhel/Dockerfile b/agent2/rhel/Dockerfile index 58508233d..1243dc343 100644 --- a/agent2/rhel/Dockerfile +++ b/agent2/rhel/Dockerfile @@ -95,7 +95,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ diff --git a/agent2/ubuntu/Dockerfile b/agent2/ubuntu/Dockerfile index 17fc48a3e..1d6a40266 100644 --- a/agent2/ubuntu/Dockerfile +++ b/agent2/ubuntu/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux && \ g++ \ golang && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/java-gateway/ol/README.md b/java-gateway/ol/README.md index ad35e18b8..7897ada12 100644 --- a/java-gateway/ol/README.md +++ b/java-gateway/ol/README.md @@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav # Zabbix Java Gateway images -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix Java Gateway are: +These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix Java Gateway Docker images. They are based on Zabbix Java Gateway 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix Java Gateway 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix Java Gateway 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix Java Gateway 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix Java Gateway 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix Java Gateway 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix Java Gateway 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix Java Gateway 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix Java Gateway 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. @@ -100,10 +100,6 @@ The volume allows include additional JAR files to extend allowed protocols for Z The `zabbix-java-gateway` images come in many flavors, each designed for a specific use case. -## `zabbix-java-gateway: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-java-gateway:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -112,6 +108,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-java-gateway: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 + # Supported Docker versions This image is officially supported on Docker version 1.12.0. @@ -124,7 +128,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/current/java-gateway) 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 [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/3.0/java-gateway) 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/java-gateway/rhel/Dockerfile b/java-gateway/rhel/Dockerfile index 707d14047..b2cebfa5f 100644 --- a/java-gateway/rhel/Dockerfile +++ b/java-gateway/rhel/Dockerfile @@ -73,7 +73,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/java-gateway/rhel/README.md b/java-gateway/rhel/README.md index 86edddf95..7897ada12 100644 --- a/java-gateway/rhel/README.md +++ b/java-gateway/rhel/README.md @@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav # Zabbix Java Gateway images -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix Java Gateway are: +These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,11 +28,13 @@ These are the only official Zabbix Java Gateway Docker images. They are based on Zabbix Java Gateway 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix Java Gateway 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix Java Gateway 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix Java Gateway 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix Java Gateway 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix Java Gateway 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix Java Gateway 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix Java Gateway 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix Java Gateway 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. @@ -98,10 +100,6 @@ The volume allows include additional JAR files to extend allowed protocols for Z The `zabbix-java-gateway` images come in many flavors, each designed for a specific use case. -## `zabbix-java-gateway: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-java-gateway:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -110,6 +108,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-java-gateway: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 + # Supported Docker versions This image is officially supported on Docker version 1.12.0. @@ -122,7 +128,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta ## Documentation -Documentation for this image is stored in the [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/current/java-gateway) 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 [`java-gateway/` directory](https://github.com/zabbix/zabbix-docker/tree/3.0/java-gateway) 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/proxy-mysql/ol/README.md b/proxy-mysql/ol/README.md index baa70c4d8..f3db6d851 100644 --- a/proxy-mysql/ol/README.md +++ b/proxy-mysql/ol/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine Zabbix proxy 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix proxy 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix proxy 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. @@ -278,10 +278,6 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-proxy-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-proxy-mysql: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-proxy-mysql:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -290,6 +286,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-proxy-mysql: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. diff --git a/proxy-mysql/rhel/Dockerfile b/proxy-mysql/rhel/Dockerfile index 1fc88c7cd..8f6946a0f 100644 --- a/proxy-mysql/rhel/Dockerfile +++ b/proxy-mysql/rhel/Dockerfile @@ -118,7 +118,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/proxy-mysql/rhel/README.md b/proxy-mysql/rhel/README.md index 7a8fd29f0..f3db6d851 100644 --- a/proxy-mysql/rhel/README.md +++ b/proxy-mysql/rhel/README.md @@ -14,23 +14,27 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix proxy are: - Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) - Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) - Zabbix proxy 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2.*) (unsupported) + Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) + Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) + Zabbix proxy 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest) (unsupported) Zabbix proxy 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*) (unsupported) - Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4.*) (unsupported) + Zabbix proxy 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest) (unsupported) Zabbix proxy 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*) (unsupported) Zabbix proxy 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest) Zabbix proxy 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*) - Zabbix proxy 4.2 (tags: alpine-4.2-latest, ubuntu-4.2-latest, centos-4.2.*) (unsupported) + Zabbix proxy 4.2 (tags: alpine-4.2-latest, ubuntu-4.2-latest, centos-4.2-latest) (unsupported) Zabbix proxy 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix proxy 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix proxy 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. @@ -165,6 +169,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_VAULTDBPATH= # Available since 5.2.0 +ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 +VAULT_TOKEN= # Available since 5.2.0 ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_HOSTNAMEITEM=system.hostname @@ -181,6 +188,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 @@ -270,10 +278,6 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-proxy-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-proxy-mysql: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-proxy-mysql:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -282,6 +286,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-proxy-mysql: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. diff --git a/proxy-sqlite3/ol/README.md b/proxy-sqlite3/ol/README.md index 253e3dd2d..a1b2cb423 100644 --- a/proxy-sqlite3/ol/README.md +++ b/proxy-sqlite3/ol/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine Zabbix proxy 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix proxy 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix proxy 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix proxy 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. @@ -236,10 +236,6 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-proxy-sqlite3` images come in many flavors, each designed for a specific use case. -## `zabbix-proxy-sqlite3: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-proxy-sqlite3:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -248,6 +244,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-proxy-sqlite3: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. diff --git a/proxy-sqlite3/rhel/Dockerfile b/proxy-sqlite3/rhel/Dockerfile index 5fe8a48c8..b265232f6 100644 --- a/proxy-sqlite3/rhel/Dockerfile +++ b/proxy-sqlite3/rhel/Dockerfile @@ -115,7 +115,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/proxy-sqlite3/rhel/README.md b/proxy-sqlite3/rhel/README.md index 887e93f10..a1b2cb423 100644 --- a/proxy-sqlite3/rhel/README.md +++ b/proxy-sqlite3/rhel/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,11 +28,13 @@ These are the only official Zabbix proxy Docker images. They are based on Alpine Zabbix proxy 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix proxy 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix proxy 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix proxy 5.2 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix proxy 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix proxy 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix proxy 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix proxy 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix proxy 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. @@ -144,6 +146,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=1 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_JAVAGATEWAY=zabbix-java-gateway ZBX_JAVAGATEWAYPORT=10052 @@ -233,10 +236,6 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-proxy-sqlite3` images come in many flavors, each designed for a specific use case. -## `zabbix-proxy-sqlite3: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-proxy-sqlite3:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -245,6 +244,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-proxy-sqlite3: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. diff --git a/server-mysql/ol/README.md b/server-mysql/ol/README.md index 7670578d3..4253197e0 100644 --- a/server-mysql/ol/README.md +++ b/server-mysql/ol/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -30,13 +30,13 @@ These are the only official Zabbix server Docker images. They are based on Alpin Zabbix server 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix server 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix server 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. @@ -261,10 +261,6 @@ Directory for real-time export of events, history and trends in newline-delimite The `zabbix-server-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-server-mysql: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-server-mysql:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -273,6 +269,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-server-mysql: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. diff --git a/server-mysql/rhel/Dockerfile b/server-mysql/rhel/Dockerfile index ca061e7dc..4feec44d5 100644 --- a/server-mysql/rhel/Dockerfile +++ b/server-mysql/rhel/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/server-mysql/rhel/README.md b/server-mysql/rhel/README.md index f672cd64b..4253197e0 100644 --- a/server-mysql/rhel/README.md +++ b/server-mysql/rhel/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -30,11 +30,13 @@ These are the only official Zabbix server Docker images. They are based on Alpin Zabbix server 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix server 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix server 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix server 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. @@ -141,6 +143,8 @@ ZBX_VAULTDBPATH= # Available since 5.2.0 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 VAULT_TOKEN= # Available since 5.2.0 ZBX_LISTENIP= +ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 +ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -150,6 +154,7 @@ ZBX_STARTPOLLERSUNREACHABLE=1 ZBX_STARTTRAPPERS=5 ZBX_STARTPINGERS=1 ZBX_STARTDISCOVERERS=1 +ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 ZBX_STARTHTTPPOLLERS=1 ZBX_STARTTIMERS=1 ZBX_STARTESCALATORS=1 @@ -173,6 +178,7 @@ ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 +ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 @@ -255,10 +261,6 @@ Directory for real-time export of events, history and trends in newline-delimite The `zabbix-server-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-server-mysql: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-server-mysql:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -267,6 +269,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-server-mysql: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. diff --git a/server-pgsql/ol/README.md b/server-pgsql/ol/README.md index 228062dab..1eef69d3c 100644 --- a/server-pgsql/ol/README.md +++ b/server-pgsql/ol/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -30,13 +30,13 @@ These are the only official Zabbix server Docker images. They are based on Alpin Zabbix server 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix server 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix server 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. @@ -258,11 +258,7 @@ Directory for real-time export of events, history and trends in newline-delimite The `zabbix-server-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-server-pgsql: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-server-pgsql:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -270,6 +266,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. diff --git a/snmptraps/ol/README.md b/snmptraps/ol/README.md index 40a6eba22..b64578fd9 100644 --- a/snmptraps/ol/README.md +++ b/snmptraps/ol/README.md @@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac # Zabbix snmptraps images -These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix snmptraps are: +These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix snmptraps are: Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix snmptraps Docker images. They are based on Al Zabbix snmptraps 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix snmptraps 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix snmptraps 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix snmptraps 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix snmptraps 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix snmptraps 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix snmptraps 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix snmptraps 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix snmptraps 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix snmptraps 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix snmptraps 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix snmptraps 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix snmptraps 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix snmptraps 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix snmptraps 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix snmptraps 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk) Images are updated when new releases are published. @@ -80,15 +80,7 @@ The volume allows to add new MIB files. It does not support subdirectories, all The `zabbix-snmptraps` images come in many flavors, each designed for a specific use case. -## `zabbix-snmptraps: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-snmptraps:centos-` - -This is the defacto image also. 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-snmptraps:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -96,6 +88,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. diff --git a/web-apache-mysql/ol/README.md b/web-apache-mysql/ol/README.md index c6085adf8..67ee8fd2f 100644 --- a/web-apache-mysql/ol/README.md +++ b/web-apache-mysql/ol/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix web interface are: Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix web interface Docker images. They are based o Zabbix web interface 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix web interface 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix web interface 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. @@ -236,11 +236,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-web-apache-mysql: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-web-apache-mysql:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -248,6 +244,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. diff --git a/web-apache-pgsql/ol/README.md b/web-apache-pgsql/ol/README.md index 2f0da553b..6722f51f3 100644 --- a/web-apache-pgsql/ol/README.md +++ b/web-apache-pgsql/ol/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix web interface are: Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix web interface Docker images. They are based o Zabbix web interface 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix web interface 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix web interface 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. @@ -230,11 +230,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-web-apache-pgsql: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-web-apache-pgsql:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -242,6 +238,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. diff --git a/web-nginx-mysql/ol/README.md b/web-nginx-mysql/ol/README.md index 2067e268c..f19e88149 100644 --- a/web-nginx-mysql/ol/README.md +++ b/web-nginx-mysql/ol/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix web interface are: Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix web interface Docker images. They are based o Zabbix web interface 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix web interface 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix web interface 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. @@ -237,11 +237,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-web-nginx-mysql: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-web-nginx-mysql:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -249,6 +245,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. diff --git a/web-nginx-mysql/rhel/Dockerfile b/web-nginx-mysql/rhel/Dockerfile index 5ef481816..3b47bc959 100644 --- a/web-nginx-mysql/rhel/Dockerfile +++ b/web-nginx-mysql/rhel/Dockerfile @@ -87,7 +87,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /usr/share/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ mkdir /usr/share/zabbix/ && \ cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-mysql/rhel/README.md b/web-nginx-mysql/rhel/README.md index 89d375a05..f19e88149 100644 --- a/web-nginx-mysql/rhel/README.md +++ b/web-nginx-mysql/rhel/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix web interface are: Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,11 +28,13 @@ These are the only official Zabbix web interface Docker images. They are based o Zabbix web interface 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix web interface 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix web interface 5.4 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix web interface 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. @@ -235,11 +237,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. -## `zabbix-web-nginx-mysql: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-web-nginx-mysql:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -247,6 +245,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. diff --git a/web-nginx-pgsql/ol/Dockerfile b/web-nginx-pgsql/ol/Dockerfile index 8607fec78..d7638c008 100644 --- a/web-nginx-pgsql/ol/Dockerfile +++ b/web-nginx-pgsql/ol/Dockerfile @@ -73,7 +73,7 @@ RUN set -eux && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /usr/share/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ mkdir /usr/share/zabbix/ && \ cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-pgsql/ol/README.md b/web-nginx-pgsql/ol/README.md index cfd3ce83d..7309f684b 100644 --- a/web-nginx-pgsql/ol/README.md +++ b/web-nginx-pgsql/ol/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal) and CentOS 8 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 images. The available versions of Zabbix web interface are: Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) (unsupported) Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported) @@ -28,13 +28,13 @@ These are the only official Zabbix web interface Docker images. They are based o Zabbix web interface 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported) Zabbix web interface 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported) Zabbix web interface 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported) - Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, centos-5.0-latest) - Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, centos-5.0.*) - Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, centos-5.2-latest) - Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, centos-5.2.*) - Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, centos-5.4-latest, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix web interface 6.0 (tags: alpine-trunk, ubuntu-trunk, centos-trunk) + Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) + Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) + Zabbix web interface 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest) + Zabbix web interface 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*) + Zabbix web interface 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest) + Zabbix web interface 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*) + Zabbix web interface 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. @@ -230,11 +230,7 @@ The volume allows to use custom certificates for SAML authentification. The volu The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. -## `zabbix-web-nginx-pgsql: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-web-nginx-pgsql:alpine-` +## `zabbix-agent2:alpine-` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. @@ -242,6 +238,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. diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 8fc157d87..23f1b7c39 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -147,7 +147,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \