Prepare for Zabbix 5.4 release

wanzhanhui · May 17, 2021 · 84a0cc3 · 84a0cc3
1 parent cbf06bb
commit 84a0cc3
Show file tree

Hide file tree

Showing 46 changed files with 99 additions and 99 deletions.
diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
@@ -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 && \

diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile
@@ -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 && \

diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile
@@ -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 && \

diff --git a/agent2/alpine/Dockerfile b/agent2/alpine/Dockerfile
@@ -56,7 +56,7 @@ RUN set -eux && \
             openssl-dev \
             zlib-dev && \
     cd /tmp/ && \
-    git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
+    git 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 && \

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

diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -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

diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml
@@ -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

diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml
@@ -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

diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml
@@ -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