extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-23 06:49:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for Zabbix 5.4 release

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-05-17 15:04:07 +05:00
parent cbf06bb6de
commit 84a0cc3227
46 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/Dockerfile
View File

@ -58,7 +58,7 @@ RUN set -eux && \
make \
git && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
agent/centos/Dockerfile
View File

@ -82,7 +82,7 @@ RUN set -eux && \
git \
gcc && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
agent/ubuntu/Dockerfile
View File

@ -73,7 +73,7 @@ RUN set -eux && \
git \
gcc && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
agent2/alpine/Dockerfile
View File

@ -56,7 +56,7 @@ RUN set -eux && \
openssl-dev \
zlib-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`git rev-parse --short HEAD` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \

2
agent2/ubuntu/Dockerfile
View File

@ -70,7 +70,7 @@ RUN set -eux && \
g++ \
golang && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

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-5.4-latest
image: zabbix/zabbix-server-mysql:alpine-trunk
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-5.4-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
profiles:
- all
ports:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-5.4-latest
image: zabbix/zabbix-proxy-mysql:alpine-trunk
profiles:
- all
ports:
@ -171,7 +171,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:alpine-5.4-latest
image: zabbix/zabbix-web-apache-mysql:alpine-trunk
profiles:
- all
ports:
@ -227,7 +227,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:alpine-5.4-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
ports:
- "80:8080"
- "443:8443"
@ -281,7 +281,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-5.4-latest
image: zabbix/zabbix-agent:alpine-trunk
profiles:
- full
- all
@ -321,7 +321,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-5.4-latest
image: zabbix/zabbix-java-gateway:alpine-trunk
profiles:
- full
- all
@ -350,7 +350,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-5.4-latest
image: zabbix/zabbix-snmptraps:alpine-trunk
profiles:
- full
- all
@ -379,7 +379,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-service:
image: zabbix/zabbix-web-service:alpine-5.4-latest
image: zabbix/zabbix-web-service:alpine-trunk
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-5.4-latest
image: zabbix/zabbix-server-pgsql:alpine-trunk
ports:
- "10051:10051"
volumes:
@ -63,7 +63,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-5.4-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
profiles:
- all
ports:
@ -112,7 +112,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-5.4-latest
image: zabbix/zabbix-proxy-mysql:alpine-trunk
profiles:
- all
ports:
@ -167,7 +167,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:alpine-5.4-latest
image: zabbix/zabbix-web-apache-pgsql:alpine-trunk
profiles:
- all
ports:
@ -223,7 +223,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:alpine-5.4-latest
image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk
ports:
- "80:8080"
- "443:8443"
@ -277,7 +277,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-5.4-latest
image: zabbix/zabbix-agent:alpine-trunk
profiles:
- full
- all
@ -317,7 +317,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-5.4-latest
image: zabbix/zabbix-java-gateway:alpine-trunk
profiles:
- full
- all
@ -346,7 +346,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:alpine-5.4-latest
image: zabbix/zabbix-snmptraps:alpine-trunk
profiles:
- full
- all
@ -375,7 +375,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-service:
image: zabbix/zabbix-web-service:alpine-5.4-latest
image: zabbix/zabbix-web-service:alpine-trunk
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-5.4-latest
image: zabbix/zabbix-server-mysql:centos-trunk
ports:
- "10051:10051"
volumes:
@ -64,7 +64,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-5.4-latest
image: zabbix/zabbix-proxy-sqlite3:centos-trunk
profiles:
- all
ports:
@ -113,7 +113,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-5.4-latest
image: zabbix/zabbix-proxy-mysql:centos-trunk
profiles:
- all
ports:
@ -171,7 +171,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:centos-5.4-latest
image: zabbix/zabbix-web-apache-mysql:centos-trunk
profiles:
- all
ports:
@ -227,7 +227,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:centos-5.4-latest
image: zabbix/zabbix-web-nginx-mysql:centos-trunk
ports:
- "80:8080"
- "443:8443"
@ -281,7 +281,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-5.4-latest
image: zabbix/zabbix-agent:centos-trunk
profiles:
- full
- all
@ -321,7 +321,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-5.4-latest
image: zabbix/zabbix-java-gateway:centos-trunk
profiles:
- full
- all
@ -350,7 +350,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:centos-5.4-latest
image: zabbix/zabbix-snmptraps:centos-trunk
profiles:
- full
- all
@ -379,7 +379,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-service:
image: zabbix/zabbix-web-service:centos-5.4-latest
image: zabbix/zabbix-web-service:centos-trunk
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-5.4-latest
image: zabbix/zabbix-server-pgsql:centos-trunk
ports:
- "10051:10051"
volumes:
@ -63,7 +63,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-5.4-latest
image: zabbix/zabbix-proxy-sqlite3:centos-trunk
profiles:
- all
ports:
@ -112,7 +112,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-5.4-latest
image: zabbix/zabbix-proxy-mysql:centos-trunk
profiles:
- all
ports:
@ -167,7 +167,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:centos-5.4-latest
image: zabbix/zabbix-web-apache-pgsql:centos-trunk
profiles:
- all
ports:
@ -223,7 +223,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:centos-5.4-latest
image: zabbix/zabbix-web-nginx-pgsql:centos-trunk
ports:
- "80:8080"
- "443:8443"
@ -277,7 +277,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-5.4-latest
image: zabbix/zabbix-agent:centos-trunk
profiles:
- full
- all
@ -317,7 +317,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-5.4-latest
image: zabbix/zabbix-java-gateway:centos-trunk
profiles:
- full
- all
@ -346,7 +346,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:centos-5.4-latest
image: zabbix/zabbix-snmptraps:centos-trunk
profiles:
- full
- all
@ -375,7 +375,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-service:
image: zabbix/zabbix-web-service:centos-5.4-latest
image: zabbix/zabbix-web-service:centos-trunk
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-5.4-latest
image: zabbix/zabbix-server-mysql:ubuntu-trunk
ports:
- "10051:10051"
volumes:
@ -111,7 +111,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-5.4-latest
image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
profiles:
- all
ports:
@ -166,7 +166,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:ubuntu-5.4-latest
image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk
profiles:
- all
ports:
@ -221,7 +221,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:ubuntu-5.4-latest
image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk
ports:
- "80:8080"
- "443:8443"
@ -274,7 +274,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-5.4-latest
image: zabbix/zabbix-agent:ubuntu-trunk
profiles:
- full
- all
@ -313,7 +313,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-5.4-latest
image: zabbix/zabbix-java-gateway:ubuntu-trunk
profiles:
- full
- all
@ -342,7 +342,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-5.4-latest
image: zabbix/zabbix-snmptraps:ubuntu-trunk
profiles:
- full
- all
@ -371,7 +371,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-service:
image: zabbix/zabbix-web-service:ubuntu-5.4-latest
image: zabbix/zabbix-web-service:ubuntu-trunk
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-5.4-latest
image: zabbix/zabbix-server-pgsql:ubuntu-trunk
ports:
- "10051:10051"
volumes:
@ -62,7 +62,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-5.4-latest
image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
profiles:
- all
ports:
@ -110,7 +110,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-5.4-latest
image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
profiles:
- all
ports:
@ -164,7 +164,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:ubuntu-5.4-latest
image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk
profiles:
- all
ports:
@ -219,7 +219,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-5.4-latest
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk
ports:
- "80:8080"
- "443:8443"
@ -272,7 +272,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-5.4-latest
image: zabbix/zabbix-agent:ubuntu-trunk
profiles:
- full
- all
@ -311,7 +311,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-5.4-latest
image: zabbix/zabbix-java-gateway:ubuntu-trunk
profiles:
- full
- all
@ -340,7 +340,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-5.4-latest
image: zabbix/zabbix-snmptraps:ubuntu-trunk
profiles:
- full
- all
@ -369,7 +369,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-service:
image: zabbix/zabbix-web-service:ubuntu-5.4-latest
image: zabbix/zabbix-web-service:ubuntu-trunk
profiles:
- full
- all

2
java-gateway/alpine/Dockerfile
View File

@ -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 clone ${ZBX_SOURCES} --branch master --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 && \

2
java-gateway/centos/Dockerfile
View File

@ -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 clone ${ZBX_SOURCES} --branch master --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 && \

2
java-gateway/ubuntu/Dockerfile
View File

@ -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 clone ${ZBX_SOURCES} --branch master --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 && \

14
kubernetes.yaml
View File

@ -148,7 +148,7 @@ spec:
spec:
containers:
- name: zabbix-web
image: zabbix/zabbix-web-nginx-mysql:alpine-5.4-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
imagePullPolicy: Always
ports:
- containerPort: 8080
@ -282,7 +282,7 @@ spec:
spec:
containers:
- name: zabbix-server
image: zabbix/zabbix-server-mysql:alpine-5.4-latest
image: zabbix/zabbix-server-mysql:alpine-trunk
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -331,7 +331,7 @@ spec:
mountPath: /var/lib/zabbix/snmptraps/
readOnly: true
- name: zabbix-snmptraps
image: zabbix/zabbix-snmptraps:alpine-5.4-latest
image: zabbix/zabbix-snmptraps:alpine-trunk
imagePullPolicy: Always
ports:
- containerPort: 1162
@ -364,7 +364,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-sqlite3
image: zabbix/zabbix-proxy-sqlite3:alpine-5.4-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -396,7 +396,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-mysql
image: zabbix/zabbix-proxy-mysql:alpine-5.4-latest
image: zabbix/zabbix-proxy-mysql:alpine-trunk
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -439,7 +439,7 @@ spec:
spec:
containers:
- name: zabbix-java-gateway
image: zabbix/zabbix-java-gateway:alpine-5.4-latest
image: zabbix/zabbix-java-gateway:alpine-trunk
imagePullPolicy: Always
ports:
- containerPort: 10052
@ -473,7 +473,7 @@ spec:
spec:
containers:
- name: zabbix-agent
image: zabbix/zabbix-agent:alpine-5.4-latest
image: zabbix/zabbix-agent:alpine-trunk
imagePullPolicy: Always
resources:
limits:

2
proxy-mysql/alpine/Dockerfile
View File

@ -81,7 +81,7 @@ RUN set -eux && \
pcre-dev \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
proxy-mysql/centos/Dockerfile
View File

@ -111,7 +111,7 @@ RUN set -eux && \
git \
unixODBC-devel && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
proxy-mysql/ubuntu/Dockerfile
View File

@ -95,7 +95,7 @@ RUN set -eux && \
git \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
proxy-sqlite3/alpine/Dockerfile
View File

@ -80,7 +80,7 @@ RUN set -eux && \
make \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
proxy-sqlite3/centos/Dockerfile
View File

@ -108,7 +108,7 @@ RUN set -eux && \
git \
unixODBC-devel && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
proxy-sqlite3/ubuntu/Dockerfile
View File

@ -93,7 +93,7 @@ RUN set -eux && \
git \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
server-mysql/alpine/Dockerfile
View File

@ -85,7 +85,7 @@ RUN set -eux && \
make \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
server-mysql/centos/Dockerfile
View File

@ -116,7 +116,7 @@ RUN set -eux && \
git \
unixODBC-devel && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
server-mysql/ubuntu/Dockerfile
View File

@ -100,7 +100,7 @@ RUN set -eux && \
git \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
server-pgsql/alpine/Dockerfile
View File

@ -86,7 +86,7 @@ RUN set -eux && \
make \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
server-pgsql/centos/Dockerfile
View File

@ -115,7 +115,7 @@ RUN set -eux && \
git \
unixODBC-devel && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
server-pgsql/ubuntu/Dockerfile
View File

@ -100,7 +100,7 @@ RUN set -eux && \
git \
unixodbc-dev && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \

2
snmptraps/alpine/Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:3.13
ARG MAJOR_VERSION=5.4
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

2
snmptraps/centos/Dockerfile
View File

@ -1,6 +1,6 @@
FROM centos:centos8
ARG MAJOR_VERSION=5.4
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

2
snmptraps/ubuntu/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:focal
ARG MAJOR_VERSION=5.4
ARG MAJOR_VERSION=6.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git

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

@ -75,7 +75,7 @@ RUN set -eux && \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -70,7 +70,7 @@ RUN set -eux && \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -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 clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -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 clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -70,7 +70,7 @@ RUN set -eux && \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -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 clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -69,7 +69,7 @@ RUN set -eux && \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -62,7 +62,7 @@ RUN set -eux && \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -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 clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -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 clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -62,7 +62,7 @@ RUN set -eux && \
gettext \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

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

@ -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 clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \

2
web-service/alpine/Dockerfile
View File

@ -47,7 +47,7 @@ RUN set -eux && \
git \
pkgconf && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`git rev-parse --short HEAD` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \

2
web-service/centos/Dockerfile
View File

@ -52,7 +52,7 @@ RUN set -eux && \
golang \
git && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`git rev-parse --short HEAD` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \

2
web-service/ubuntu/Dockerfile
View File

@ -66,7 +66,7 @@ RUN set -eux && \
g++ \
golang && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`git rev-parse --short HEAD` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \

2
zabbix-appliance/rhel/Dockerfile
View File

@ -144,7 +144,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr
dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
--setopt=tsflags=nodocs ${INSTALL_PKGS} && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git clone ${ZBX_SOURCES} --branch master --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 && \