From b011c4d16df8e3080308b056ca99af12cb2fdab1 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Oct 2017 19:05:18 +0300 Subject: [PATCH] Fixed MySQL user creation --- agent/alpine/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- docker-compose_v2_alpine_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_alpine_pgsql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_pgsql_latest.yaml | 16 ++++++++-------- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 24 files changed, 72 insertions(+), 72 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index c323bebe0..e9981ae75 100644 --- a/agent/alpine/Dockerfile +++ b/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 && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index b36bc78a3..0971987ee 100644 --- a/agent/ubuntu/Dockerfile +++ b/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 && \ diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index 05a65dcb0..068d45dee 100644 --- a/docker-compose_v2_alpine_mysql_latest.yaml +++ b/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: diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml index 39ede361f..9051c1cb7 100644 --- a/docker-compose_v2_alpine_pgsql_latest.yaml +++ b/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: diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index 70e2b34bc..535ceaa95 100644 --- a/docker-compose_v2_ubuntu_mysql_latest.yaml +++ b/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: diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index 713a2e4f1..df40f14c2 100644 --- a/docker-compose_v2_ubuntu_pgsql_latest.yaml +++ b/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: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 1a8bffafa..2a84b2aa2 100644 --- a/java-gateway/alpine/Dockerfile +++ b/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 \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 78ebc9752..82431c6b1 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/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 && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 0590ceccf..1f521da80 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/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 \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index e34879fa6..a93d91be7 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/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 && \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 73410db88..8b3fb969a 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/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 \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 676ef3bba..238b697a3 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/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 && \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 3098cbdd6..d2be21bda 100644 --- a/server-mysql/alpine/Dockerfile +++ b/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 \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index f530b95d0..a177dc885 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/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 && \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 0e878f8a7..3ac0f2719 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/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 \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 729b28811..b171a703d 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/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 && \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 5c1599151..27158e4c5 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/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 diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 3431e8bf5..c6c2f64ff 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/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 diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index a623f3390..65c1bbf35 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/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 diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 8c9ea2c6a..250157646 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/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 diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 2d41b97a8..00acc090e 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/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 diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 295dc00d0..86ccf25b0 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/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 diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 1b5a243e8..2ab34ac57 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/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 diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 8e34dcd6b..84eb4f398 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/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