extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-03-30 17:56:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zabbix 6.0 release

Browse Source
This commit is contained in:
Alexey Pustovalov 2022-02-15 12:00:22 +02:00
parent e47ae41164
commit ba5c52c5cf
95 changed files with 195 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/agent/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/agent/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent/windows/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
# escape=`
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent-${ZBX_VERSION}
ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022

2
Dockerfiles/agent2/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent2/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent2/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/agent2/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent2/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/agent2/windows/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
# escape=`
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent2-${ZBX_VERSION}
ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022

2
Dockerfiles/build-base/alpine/Dockerfile
View File

@ -2,7 +2,7 @@
FROM alpine:3.15
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} \

2
Dockerfiles/build-base/centos/Dockerfile
View File

@ -2,7 +2,7 @@
FROM centos:centos8
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} \

2
Dockerfiles/build-base/ol/Dockerfile
View File

@ -2,7 +2,7 @@
FROM oraclelinux:8-slim
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} \

4
Dockerfiles/build-base/rhel/Dockerfile
View File

@ -2,8 +2,8 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} \

2
Dockerfiles/build-base/ubuntu/Dockerfile
View File

@ -2,7 +2,7 @@
FROM ubuntu:focal
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} \

4
Dockerfiles/build-mysql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -40,7 +40,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-mysql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -34,7 +34,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-mysql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -21,7 +21,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
RUN set -eux && \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

6
Dockerfiles/build-mysql/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -44,7 +44,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-mysql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -40,7 +40,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-mysql/windows/Dockerfile.agent
View File

@ -29,8 +29,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
`
Write-Host ('Checkout GIT {0} (master) repository ...' -f $env:ZBX_SOURCES); `
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch master --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:ZBX_VERSION); `
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:ZBX_VERSION --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
`
Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
Set-Location -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION; `

4
Dockerfiles/build-mysql/windows/Dockerfile.agent2
View File

@ -29,8 +29,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
`
Write-Host ('Checkout GIT {0} (master) repository ...' -f $env:ZBX_SOURCES); `
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch master --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:ZBX_VERSION); `
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:ZBX_VERSION --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
`
Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
Set-Location -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION; `

4
Dockerfiles/build-pgsql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -40,7 +40,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-pgsql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -34,7 +34,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-pgsql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -21,7 +21,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
RUN set -eux && \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

2
Dockerfiles/build-pgsql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/build-sqlite3/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -40,7 +40,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-sqlite3/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -34,7 +34,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-sqlite3/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -21,7 +21,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
RUN set -eux && \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

6
Dockerfiles/build-sqlite3/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -44,7 +44,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

4
Dockerfiles/build-sqlite3/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder
@ -40,7 +40,7 @@ RUN set -eux && \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/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 && \

2
Dockerfiles/java-gateway/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/java-gateway/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/java-gateway/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/java-gateway/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/java-gateway/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-mysql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-mysql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-mysql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/proxy-mysql/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-mysql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

2
Dockerfiles/proxy-sqlite3/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-sqlite3/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-sqlite3/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/proxy-sqlite3/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-mysql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-mysql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-mysql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/server-mysql/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-mysql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-pgsql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-pgsql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-pgsql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/server-pgsql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/snmptraps/alpine/Dockerfile
View File

@ -1,7 +1,7 @@
FROM alpine:3.15
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \

2
Dockerfiles/snmptraps/centos/Dockerfile
View File

@ -1,7 +1,7 @@
FROM centos:centos8
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \

2
Dockerfiles/snmptraps/ol/Dockerfile
View File

@ -1,7 +1,7 @@
FROM oraclelinux:8-slim
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \

4
Dockerfiles/snmptraps/rhel/Dockerfile
View File

@ -1,8 +1,8 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

2
Dockerfiles/snmptraps/ubuntu/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:focal
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \

2
Dockerfiles/web-apache-mysql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-mysql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-mysql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-pgsql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-pgsql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-mysql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-mysql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/web-nginx-mysql/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-pgsql/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-pgsql/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-service/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-service/centos/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-service/ol/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

4
Dockerfiles/web-service/rhel/Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

2
Dockerfiles/web-service/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} as builder

6
Dockerfiles/zabbix-appliance/rhel/Dockerfile
View File

@ -1,8 +1,8 @@
FROM registry.access.redhat.com/ubi8/ubi
ARG MAJOR_VERSION=6.0
ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.0
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \
@ -129,7 +129,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr
dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
--setopt=tsflags=nodocs ${INSTALL_PKGS} && \
cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --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 && \

4
README.md
View File

@ -1,7 +1,7 @@
![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png)
[![Build images (DockerHub)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml/badge.svg?branch=trunk&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml)
[![Build images (DockerHub, Windows)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml/badge.svg?branch=trunk&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml)
[![Build images (DockerHub)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml/badge.svg?branch=6.0&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build.yml)
[![Build images (DockerHub, Windows)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml/badge.svg?branch=6.0&event=push)](https://github.com/zabbix/zabbix-docker/actions/workflows/images_build_windows.yml)
# What is Zabbix?

18
docker-compose_v3_alpine_mysql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:alpine-trunk
image: zabbix/zabbix-server-mysql:alpine-6.0-latest
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
image: zabbix/zabbix-proxy-sqlite3:alpine-6.0-latest
profiles:
- all
ports:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-trunk
image: zabbix/zabbix-proxy-mysql:alpine-6.0-latest
profiles:
- all
ports:
@ -171,7 +171,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:alpine-trunk
image: zabbix/zabbix-web-apache-mysql:alpine-6.0-latest
profiles:
- all
ports:
@ -227,7 +227,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
image: zabbix/zabbix-web-nginx-mysql:alpine-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -281,7 +281,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-trunk
image: zabbix/zabbix-agent:alpine-6.0-latest
profiles:
- full
- all
@ -321,7 +321,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-trunk
image: zabbix/zabbix-java-gateway:alpine-6.0-latest
profiles:
- full
- all
@ -350,7 +350,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-trunk
image: zabbix/zabbix-snmptraps:alpine-6.0-latest
profiles:
- full
- all
@ -379,7 +379,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-service:
image: zabbix/zabbix-web-service:alpine-trunk
image: zabbix/zabbix-web-service:alpine-6.0-latest
profiles:
- full
- all

18
docker-compose_v3_alpine_pgsql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:alpine-trunk
image: zabbix/zabbix-server-pgsql:alpine-6.0-latest
ports:
- "10051:10051"
volumes:
@ -63,7 +63,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
image: zabbix/zabbix-proxy-sqlite3:alpine-6.0-latest
profiles:
- all
ports:
@ -112,7 +112,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-trunk
image: zabbix/zabbix-proxy-mysql:alpine-6.0-latest
profiles:
- all
ports:
@ -167,7 +167,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:alpine-trunk
image: zabbix/zabbix-web-apache-pgsql:alpine-6.0-latest
profiles:
- all
ports:
@ -223,7 +223,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk
image: zabbix/zabbix-web-nginx-pgsql:alpine-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -277,7 +277,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-trunk
image: zabbix/zabbix-agent:alpine-6.0-latest
profiles:
- full
- all
@ -317,7 +317,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-trunk
image: zabbix/zabbix-java-gateway:alpine-6.0-latest
profiles:
- full
- all
@ -346,7 +346,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-trunk
image: zabbix/zabbix-snmptraps:alpine-6.0-latest
profiles:
- full
- all
@ -375,7 +375,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-service:
image: zabbix/zabbix-web-service:alpine-trunk
image: zabbix/zabbix-web-service:alpine-6.0-latest
profiles:
- full
- all

18
docker-compose_v3_centos_mysql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:centos-trunk
image: zabbix/zabbix-server-mysql:centos-6.0-latest
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-trunk
image: zabbix/zabbix-proxy-sqlite3:centos-6.0-latest
profiles:
- all
ports:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-trunk
image: zabbix/zabbix-proxy-mysql:centos-6.0-latest
profiles:
- all
ports:
@ -171,7 +171,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:centos-trunk
image: zabbix/zabbix-web-apache-mysql:centos-6.0-latest
profiles:
- all
ports:
@ -227,7 +227,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:centos-trunk
image: zabbix/zabbix-web-nginx-mysql:centos-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -281,7 +281,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-trunk
image: zabbix/zabbix-agent:centos-6.0-latest
profiles:
- full
- all
@ -321,7 +321,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-trunk
image: zabbix/zabbix-java-gateway:centos-6.0-latest
profiles:
- full
- all
@ -350,7 +350,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:centos-trunk
image: zabbix/zabbix-snmptraps:centos-6.0-latest
profiles:
- full
- all
@ -379,7 +379,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-service:
image: zabbix/zabbix-web-service:centos-trunk
image: zabbix/zabbix-web-service:centos-6.0-latest
profiles:
- full
- all

18
docker-compose_v3_centos_pgsql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:centos-trunk
image: zabbix/zabbix-server-pgsql:centos-6.0-latest
ports:
- "10051:10051"
volumes:
@ -63,7 +63,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-trunk
image: zabbix/zabbix-proxy-sqlite3:centos-6.0-latest
profiles:
- all
ports:
@ -112,7 +112,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-trunk
image: zabbix/zabbix-proxy-mysql:centos-6.0-latest
profiles:
- all
ports:
@ -167,7 +167,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:centos-trunk
image: zabbix/zabbix-web-apache-pgsql:centos-6.0-latest
profiles:
- all
ports:
@ -223,7 +223,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:centos-trunk
image: zabbix/zabbix-web-nginx-pgsql:centos-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -277,7 +277,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-trunk
image: zabbix/zabbix-agent:centos-6.0-latest
profiles:
- full
- all
@ -317,7 +317,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-trunk
image: zabbix/zabbix-java-gateway:centos-6.0-latest
profiles:
- full
- all
@ -346,7 +346,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:centos-trunk
image: zabbix/zabbix-snmptraps:centos-6.0-latest
profiles:
- full
- all
@ -375,7 +375,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-service:
image: zabbix/zabbix-web-service:centos-trunk
image: zabbix/zabbix-web-service:centos-6.0-latest
profiles:
- full
- all

18
docker-compose_v3_ol_mysql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:ol-trunk
image: zabbix/zabbix-server-mysql:ol-6.0-latest
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ol-trunk
image: zabbix/zabbix-proxy-sqlite3:ol-6.0-latest
profiles:
- all
ports:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ol-trunk
image: zabbix/zabbix-proxy-mysql:ol-6.0-latest
profiles:
- all
ports:
@ -171,7 +171,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:ol-trunk
image: zabbix/zabbix-web-apache-mysql:ol-6.0-latest
profiles:
- all
ports:
@ -227,7 +227,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:ol-trunk
image: zabbix/zabbix-web-nginx-mysql:ol-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -281,7 +281,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-agent:
image: zabbix/zabbix-agent:ol-trunk
image: zabbix/zabbix-agent:ol-6.0-latest
profiles:
- full
- all
@ -321,7 +321,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ol-trunk
image: zabbix/zabbix-java-gateway:ol-6.0-latest
profiles:
- full
- all
@ -350,7 +350,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ol-trunk
image: zabbix/zabbix-snmptraps:ol-6.0-latest
profiles:
- full
- all
@ -379,7 +379,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-web-service:
image: zabbix/zabbix-web-service:ol-trunk
image: zabbix/zabbix-web-service:ol-6.0-latest
profiles:
- full
- all

18
docker-compose_v3_ol_pgsql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:ol-trunk
image: zabbix/zabbix-server-pgsql:ol-6.0-latest
ports:
- "10051:10051"
volumes:
@ -63,7 +63,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ol-trunk
image: zabbix/zabbix-proxy-sqlite3:ol-6.0-latest
profiles:
- all
ports:
@ -112,7 +112,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ol-trunk
image: zabbix/zabbix-proxy-mysql:ol-6.0-latest
profiles:
- all
ports:
@ -167,7 +167,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:ol-trunk
image: zabbix/zabbix-web-apache-pgsql:ol-6.0-latest
profiles:
- all
ports:
@ -223,7 +223,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:ol-trunk
image: zabbix/zabbix-web-nginx-pgsql:ol-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -277,7 +277,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-agent:
image: zabbix/zabbix-agent:ol-trunk
image: zabbix/zabbix-agent:ol-6.0-latest
profiles:
- full
- all
@ -317,7 +317,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ol-trunk
image: zabbix/zabbix-java-gateway:ol-6.0-latest
profiles:
- full
- all
@ -346,7 +346,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ol-trunk
image: zabbix/zabbix-snmptraps:ol-6.0-latest
profiles:
- full
- all
@ -375,7 +375,7 @@ services:
com.zabbix.os: "oracle linux"
zabbix-web-service:
image: zabbix/zabbix-web-service:ol-trunk
image: zabbix/zabbix-web-service:ol-6.0-latest
profiles:
- full
- all

16
docker-compose_v3_ubuntu_mysql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:ubuntu-trunk
image: zabbix/zabbix-server-mysql:ubuntu-6.0-latest
ports:
- "10051:10051"
volumes:
@ -111,7 +111,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
image: zabbix/zabbix-proxy-mysql:ubuntu-6.0-latest
profiles:
- all
ports:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk
image: zabbix/zabbix-web-apache-mysql:ubuntu-6.0-latest
profiles:
- all
ports:
@ -221,7 +221,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk
image: zabbix/zabbix-web-nginx-mysql:ubuntu-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -274,7 +274,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-trunk
image: zabbix/zabbix-agent:ubuntu-6.0-latest
profiles:
- full
- all
@ -313,7 +313,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-trunk
image: zabbix/zabbix-java-gateway:ubuntu-6.0-latest
profiles:
- full
- all
@ -342,7 +342,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-6.0-latest
profiles:
- full
- all
@ -371,7 +371,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-service:
image: zabbix/zabbix-web-service:ubuntu-trunk
image: zabbix/zabbix-web-service:ubuntu-6.0-latest
profiles:
- full
- all

18
docker-compose_v3_ubuntu_pgsql_latest.yaml
View File

@ -1,7 +1,7 @@
version: '3.5'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:ubuntu-trunk
image: zabbix/zabbix-server-pgsql:ubuntu-6.0-latest
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
image: zabbix/zabbix-proxy-sqlite3:ubuntu-6.0-latest
profiles:
- all
ports:
@ -110,7 +110,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
image: zabbix/zabbix-proxy-mysql:ubuntu-6.0-latest
profiles:
- all
ports:
@ -164,7 +164,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk
image: zabbix/zabbix-web-apache-pgsql:ubuntu-6.0-latest
profiles:
- all
ports:
@ -219,7 +219,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-6.0-latest
ports:
- "80:8080"
- "443:8443"
@ -272,7 +272,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-trunk
image: zabbix/zabbix-agent:ubuntu-6.0-latest
profiles:
- full
- all
@ -311,7 +311,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-trunk
image: zabbix/zabbix-java-gateway:ubuntu-6.0-latest
profiles:
- full
- all
@ -340,7 +340,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-6.0-latest
profiles:
- full
- all
@ -369,7 +369,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-service:
image: zabbix/zabbix-web-service:ubuntu-trunk
image: zabbix/zabbix-web-service:ubuntu-6.0-latest
profiles:
- full
- all

16
kubernetes.yaml
View File

@ -205,7 +205,7 @@ spec:
secretName: zabbix-mysql-client-tls-certs
containers:
- name: zabbix-web
image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
image: zabbix/zabbix-web-nginx-mysql:alpine-6.0-latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
@ -423,7 +423,7 @@ spec:
secretName: zabbix-mysql-client-tls-certs
containers:
- name: zabbix-server
image: zabbix/zabbix-server-mysql:alpine-trunk
image: zabbix/zabbix-server-mysql:alpine-6.0-latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 10051
@ -613,7 +613,7 @@ spec:
capabilities: {}
privileged: false
- name: zabbix-snmptraps
image: zabbix/zabbix-snmptraps:alpine-trunk
image: zabbix/zabbix-snmptraps:alpine-6.0-latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 1162
@ -654,7 +654,7 @@ spec:
emptyDir: {}
containers:
- name: zabbix-proxy-sqlite3
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
image: zabbix/zabbix-proxy-sqlite3:alpine-6.0-latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 10051
@ -818,7 +818,7 @@ spec:
secretName: zabbix-mysql-client-tls-certs
containers:
- name: zabbix-proxy-mysql
image: zabbix/zabbix-proxy-mysql:alpine-trunk
image: zabbix/zabbix-proxy-mysql:alpine-6.0-latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 10051
@ -1009,7 +1009,7 @@ spec:
spec:
containers:
- name: zabbix-java-gateway
image: zabbix/zabbix-java-gateway:alpine-trunk
image: zabbix/zabbix-java-gateway:alpine-6.0-latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 10052
@ -1057,7 +1057,7 @@ spec:
spec:
containers:
- name: zabbix-web-service
image: zabbix/zabbix-web-service:alpine-trunk
image: zabbix/zabbix-web-service:alpine-6.0-latest
imagePullPolicy: IfNotPresent
resources:
limits:
@ -1130,7 +1130,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: zabbix-agent
image: zabbix/zabbix-agent:alpine-trunk
image: zabbix/zabbix-agent:alpine-6.0-latest
imagePullPolicy: IfNotPresent
resources:
limits: