Added Oracle Linux 8 images instead of CentOS 8

This commit is contained in:
Alexey Pustovalov
2021-06-10 13:56:15 -04:00
parent 71a1311be5
commit 29d5009bbc
64 changed files with 583 additions and 460 deletions

View File

@ -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 && \

View File

@ -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-<version>`
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-<version>`
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-<version>`
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-<version>`
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.

View File

@ -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 && \

View File

@ -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-<version>`
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-<version>`
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-<version>`
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-<version>`
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.

View File

@ -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 && \

View File

@ -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-<version>`
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-<version>`
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-<version>`
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-<version>`
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.