diff --git a/README.md b/README.md index 7955b2753..9f3d3744c 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,12 @@ This repository contains **Dockerfile** of [Zabbix](https://zabbix.com/) for [Do ### Base Docker Image * [alpine](https://hub.docker.com/_/alpine/) -* [centos](https://hub.docker.com/_/centos/) +* [centos](https://hub.docker.com/_/centos/) till Zabbix 5.0 +* [oracle linux](https://hub.docker.com/_/oraclelinux/) from Zabbix 5.0 * [ubuntu](https://hub.docker.com/_/ubuntu/) +> **Important information: All Zabbix images based on CentOS 8 image can not be updated anymore because CentOS 8 base image is outdated (base image is not updated for half year). Because of that all images based on CentOS 8 replaced with Oracle Linux 8 as base image.** + ### Usage There is some documentation and examples in the [official Zabbix Documentation](https://www.zabbix.com/documentation/current/manual/installation/containers)! diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index d62b2e9fc..984579e7a 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -57,7 +57,7 @@ RUN set -eux && \ make \ git && \ 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/alpine/README.md b/agent/alpine/README.md index bc52e230c..4cc642f18 100644 --- a/agent/alpine/README.md +++ b/agent/alpine/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,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) - 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) - 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, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix agent 6.0 (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. @@ -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. diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index e87045433..29c03268c 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux && \ git \ gcc && \ 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/centos/README.md b/agent/centos/README.md index bc52e230c..4cc642f18 100644 --- a/agent/centos/README.md +++ b/agent/centos/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,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) - 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) - 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, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix agent 6.0 (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. @@ -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. diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 859a236ed..5c2e9f4d0 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux && \ git \ gcc && \ 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/ubuntu/README.md b/agent/ubuntu/README.md index bc52e230c..4cc642f18 100644 --- a/agent/ubuntu/README.md +++ b/agent/ubuntu/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,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) - 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) - 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, alpine-latest, ubuntu-latest, centos-latest, latest) - Zabbix agent 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, centos-5.4.*) - Zabbix agent 6.0 (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. @@ -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. diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 839eb541c..68fd1f99c 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -52,7 +52,7 @@ RUN set -eux && \ make \ openjdk8 && \ 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/alpine/README.md b/java-gateway/alpine/README.md index ad35e18b8..7897ada12 100644 --- a/java-gateway/alpine/README.md +++ b/java-gateway/alpine/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/centos/Dockerfile b/java-gateway/centos/Dockerfile index 479f79cc0..dc696d0bd 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ git \ gcc && \ 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/centos/README.md b/java-gateway/centos/README.md index ad35e18b8..7897ada12 100644 --- a/java-gateway/centos/README.md +++ b/java-gateway/centos/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/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 6a40689ae..cdc860039 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -53,7 +53,7 @@ RUN set -eux && \ git \ gcc && \ 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/ubuntu/README.md b/java-gateway/ubuntu/README.md index ad35e18b8..7897ada12 100644 --- a/java-gateway/ubuntu/README.md +++ b/java-gateway/ubuntu/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/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 02a7fd9c4..a7c74a1fe 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux && \ openldap-dev \ unixodbc-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" include/version.h && \ diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index baa70c4d8..f3db6d851 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/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/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index d09e5b2ea..469a88bdf 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux && \ git \ unixODBC-devel && \ 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/centos/README.md b/proxy-mysql/centos/README.md index baa70c4d8..f3db6d851 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/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/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index ea3e8117b..df6e801e8 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -111,7 +111,7 @@ RUN set -eux && \ git \ unixodbc-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" include/version.h && \ diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index baa70c4d8..f3db6d851 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/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-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 26228b410..844f10654 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux && \ make \ unixodbc-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" include/version.h && \ diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index 253e3dd2d..a1b2cb423 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/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/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 08cc5af8f..1570712c6 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -101,7 +101,7 @@ RUN set -eux && \ git \ unixODBC-devel && \ 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/centos/README.md b/proxy-sqlite3/centos/README.md index 253e3dd2d..a1b2cb423 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 5561c7f88..e325bdd26 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -109,7 +109,7 @@ RUN set -eux && \ git \ unixodbc-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" include/version.h && \ diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index 253e3dd2d..a1b2cb423 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/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/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index db2c12cce..7d9c434a0 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux && \ make \ unixodbc-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" include/version.h && \ diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index 7670578d3..4253197e0 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/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/centos/Dockerfile b/server-mysql/centos/Dockerfile index c3f16a958..b6bdf220f 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -109,7 +109,7 @@ RUN set -eux && \ git \ unixODBC-devel && \ 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/centos/README.md b/server-mysql/centos/README.md index 7670578d3..4253197e0 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index e3a73ce94..3f4b15ee5 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -118,7 +118,7 @@ RUN set -eux && \ git \ unixodbc-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" include/version.h && \ diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index 7670578d3..4253197e0 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/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-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index c2a755456..019ac8b8a 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux && \ make \ unixodbc-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" include/version.h && \ diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index 228062dab..1eef69d3c 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/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/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index de7937cf9..48493acd9 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -110,7 +110,7 @@ RUN set -eux && \ git \ unixODBC-devel && \ 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-pgsql/centos/README.md b/server-pgsql/centos/README.md index 228062dab..1eef69d3c 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/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/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index ad41941a1..02ad98a00 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -118,7 +118,7 @@ RUN set -eux && \ git \ unixodbc-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" include/version.h && \ diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index 228062dab..1eef69d3c 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/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/alpine/README.md b/snmptraps/alpine/README.md index 40a6eba22..b64578fd9 100644 --- a/snmptraps/alpine/README.md +++ b/snmptraps/alpine/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/snmptraps/centos/README.md b/snmptraps/centos/README.md index 40a6eba22..b64578fd9 100644 --- a/snmptraps/centos/README.md +++ b/snmptraps/centos/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/snmptraps/ubuntu/README.md b/snmptraps/ubuntu/README.md index 40a6eba22..b64578fd9 100644 --- a/snmptraps/ubuntu/README.md +++ b/snmptraps/ubuntu/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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 7817deef0..5cd6b2b0d 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index 9cce26607..f8f7becf5 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/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. @@ -232,11 +232,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. @@ -244,6 +240,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/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index e33d87474..98bc53669 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -63,7 +63,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index 9cce26607..f8f7becf5 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/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. @@ -232,11 +232,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. @@ -244,6 +240,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/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 4e0fe195a..a6947de51 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -73,7 +73,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index 9cce26607..f8f7becf5 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/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. @@ -232,11 +232,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. @@ -244,6 +240,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/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 68e98a788..90e4a9915 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -73,7 +73,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index 1910a3528..079d7fd94 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/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. @@ -226,11 +226,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. @@ -238,6 +234,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/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index e6ca194a7..00f7e9a7b 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -63,7 +63,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index 1910a3528..079d7fd94 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/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. @@ -226,11 +226,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. @@ -238,6 +234,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/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 784ccdd68..4860d6979 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -73,7 +73,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index 1910a3528..079d7fd94 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/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. @@ -226,11 +226,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. @@ -238,6 +234,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/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index e1a9d72c6..9594eb3b0 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -68,7 +68,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index 2c4eec3c9..f1dd2a515 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/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. @@ -233,11 +233,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. @@ -245,6 +241,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/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index d9faa4580..6f983d008 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -59,7 +59,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index 2c4eec3c9..f1dd2a515 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/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. @@ -233,11 +233,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. @@ -245,6 +241,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/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 40f1d8900..3c1b8efd6 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -84,7 +84,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index 2c4eec3c9..f1dd2a515 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/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. @@ -233,11 +233,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. @@ -245,6 +241,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/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 33d67009e..c3d798a3a 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -67,7 +67,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index ecb6c5b19..bacbf51e5 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/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. @@ -226,11 +226,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. @@ -238,6 +234,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/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 27f0da152..8fe68abb2 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -59,7 +59,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index ecb6c5b19..bacbf51e5 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/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. @@ -226,11 +226,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. @@ -238,6 +234,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/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 68ba621f1..a2b0085f2 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -84,7 +84,7 @@ RUN set -eux && \ gettext \ git && \ 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}/frontends/php/* /usr/share/zabbix/ && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index ecb6c5b19..bacbf51e5 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/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. @@ -226,11 +226,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. @@ -238,6 +234,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.