Fixed MySQL user creation

agent/alpine/Dockerfile

@@ -26,9 +26,9 @@ RUN addgroup zabbix && \
             libssl1.0  && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
 RUN apk update && \

agent/ubuntu/Dockerfile

@@ -30,9 +30,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \

docker-compose_v2_alpine_mysql_latest.yaml

@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:alpine-latest
+  image: zabbix/zabbix-server-mysql:alpine-trunk
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-latest
+  image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-latest
+  image: zabbix/zabbix-proxy-mysql:alpine-trunk
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:alpine-latest
+  image: zabbix/zabbix-web-apache-mysql:alpine-trunk
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:alpine-latest
+  image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-latest
+  image: zabbix/zabbix-agent:alpine-trunk
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-latest
+  image: zabbix/zabbix-java-gateway:alpine-trunk
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-trunk
   ports:
    - "162:162/udp"
   volumes:

docker-compose_v2_alpine_pgsql_latest.yaml

@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:alpine-latest
+  image: zabbix/zabbix-server-pgsql:alpine-trunk
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:alpine-latest
+  image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:alpine-latest
+  image: zabbix/zabbix-proxy-mysql:alpine-trunk
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:alpine-latest
+  image: zabbix/zabbix-web-apache-pgsql:alpine-trunk
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:alpine-latest
+  image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:alpine-latest
+  image: zabbix/zabbix-agent:alpine-trunk
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:alpine-latest
+  image: zabbix/zabbix-java-gateway:alpine-trunk
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "alpine"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-trunk
   ports:
    - "162:162/udp"
   volumes:

docker-compose_v2_ubuntu_mysql_latest.yaml

@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-mysql:ubuntu-latest
+  image: zabbix/zabbix-server-mysql:ubuntu-trunk
   ports:
    - "10051:10051"
   volumes:
@@ -44,7 +44,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
   ports:
    - "10061:10051"
   volumes:
@@ -84,7 +84,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-latest
+  image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
   ports:
    - "10071:10051"
   volumes:
@@ -125,7 +125,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:ubuntu-latest
+  image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk
   ports:
    - "80:80"
    - "443:443"
@@ -156,7 +156,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-nginx-mysql:
-  image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest
+  image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk
   ports:
    - "8081:80"
    - "8443:443"
@@ -187,7 +187,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-latest
+  image: zabbix/zabbix-agent:ubuntu-trunk
   ports:
    - "10050:10050"
   volumes:
@@ -217,7 +217,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-latest
+  image: zabbix/zabbix-java-gateway:ubuntu-trunk
   ports:
    - "10052:10052"
   env_file:
@@ -235,7 +235,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-trunk
   ports:
    - "162:162/udp"
   volumes:

docker-compose_v2_ubuntu_pgsql_latest.yaml

@@ -1,7 +1,7 @@
 version: '2'
 services:
  zabbix-server:
-  image: zabbix/zabbix-server-pgsql:ubuntu-latest
+  image: zabbix/zabbix-server-pgsql:ubuntu-trunk
   ports:
    - "10051:10051"
   volumes:
@@ -43,7 +43,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-sqlite3:
-  image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
+  image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
   ports:
    - "10061:10051"
   volumes:
@@ -83,7 +83,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-proxy-mysql:
-  image: zabbix/zabbix-proxy-mysql:ubuntu-latest
+  image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
   ports:
    - "10071:10051"
   volumes:
@@ -124,7 +124,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-apache-pgsql:
-  image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest
+  image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk
   ports:
    - "80:80"
    - "443:443"
@@ -155,7 +155,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-web-nginx-pgsql:
-  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
+  image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk
   ports:
    - "8081:80"
    - "8443:443"
@@ -186,7 +186,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-agent:
-  image: zabbix/zabbix-agent:ubuntu-latest
+  image: zabbix/zabbix-agent:ubuntu-trunk
   ports:
    - "10050:10050"
   volumes:
@@ -216,7 +216,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-java-gateway:
-  image: zabbix/zabbix-java-gateway:ubuntu-latest
+  image: zabbix/zabbix-java-gateway:ubuntu-trunk
   ports:
    - "10052:10052"
   env_file:
@@ -234,7 +234,7 @@ services:
    com.zabbix.os: "ubuntu"
 
  zabbix-snmptraps:
-  image: zabbix/zabbix-snmptraps:ubuntu-latest
+  image: zabbix/zabbix-snmptraps:ubuntu-trunk
   ports:
    - "162:162/udp"
   volumes:

java-gateway/alpine/Dockerfile

@@ -21,9 +21,9 @@ RUN addgroup zabbix && \
             openjdk8-jre-base && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
 RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \

java-gateway/ubuntu/Dockerfile

@@ -27,9 +27,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \

proxy-mysql/alpine/Dockerfile

@@ -44,9 +44,9 @@ RUN addgroup zabbix && \
             libssh2 && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \

proxy-mysql/ubuntu/Dockerfile

@@ -51,9 +51,9 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \

proxy-sqlite3/alpine/Dockerfile

@@ -40,9 +40,9 @@ RUN addgroup zabbix && \
             libssh2 && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \

proxy-sqlite3/ubuntu/Dockerfile

@@ -49,9 +49,9 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \

server-mysql/alpine/Dockerfile

@@ -45,9 +45,9 @@ RUN addgroup zabbix && \
             libssh2 && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \

server-mysql/ubuntu/Dockerfile

@@ -52,9 +52,9 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \

server-pgsql/alpine/Dockerfile

@@ -45,9 +45,9 @@ RUN addgroup zabbix && \
             libssh2 && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \

server-pgsql/ubuntu/Dockerfile

@@ -52,9 +52,9 @@ RUN locale-gen $LC_ALL && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \

web-apache-mysql/alpine/Dockerfile

@@ -37,9 +37,9 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-apache-mysql/ubuntu/Dockerfile

@@ -36,9 +36,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-apache-pgsql/alpine/Dockerfile

@@ -36,9 +36,9 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-apache-pgsql/ubuntu/Dockerfile

@@ -36,9 +36,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-nginx-mysql/alpine/Dockerfile

@@ -36,9 +36,9 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-nginx-mysql/ubuntu/Dockerfile

@@ -44,9 +44,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-nginx-pgsql/alpine/Dockerfile

@@ -35,9 +35,9 @@ RUN addgroup zabbix && \
             ttf-dejavu && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config

web-nginx-pgsql/ubuntu/Dockerfile

@@ -44,9 +44,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
-ARG MAJOR_VERSION=master
+ARG MAJOR_VERSION=4.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
 ADD conf/tmp/font-config /tmp/font-config