From 053dc17493d9ff1176e2ecffc5dd364efbe7f0dd Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 19 Feb 2018 00:13:27 +0200 Subject: [PATCH 1/8] Update compose CentOS files --- docker-compose_v2_centos_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_centos_pgsql_latest.yaml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker-compose_v2_centos_mysql_latest.yaml b/docker-compose_v2_centos_mysql_latest.yaml index b62f80e08..1ad1ddc1f 100644 --- a/docker-compose_v2_centos_mysql_latest.yaml +++ b/docker-compose_v2_centos_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:centos-latest + image: zabbix/zabbix-server-mysql:centos-3.4-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:centos-latest + image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:centos-latest + image: zabbix/zabbix-proxy-mysql:centos-3.4-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "centos" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:centos-latest + image: zabbix/zabbix-web-apache-mysql:centos-3.4-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "centos" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:centos-latest + image: zabbix/zabbix-web-nginx-mysql:centos-3.4-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "centos" zabbix-agent: - image: zabbix/zabbix-agent:centos-latest + image: zabbix/zabbix-agent:centos-3.4-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "centos" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:centos-latest + image: zabbix/zabbix-java-gateway:centos-3.4-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "centos" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_centos_pgsql_latest.yaml b/docker-compose_v2_centos_pgsql_latest.yaml index 5a4894a98..2faac2e06 100644 --- a/docker-compose_v2_centos_pgsql_latest.yaml +++ b/docker-compose_v2_centos_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:centos-latest + image: zabbix/zabbix-server-pgsql:centos-3.4-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:centos-latest + image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:centos-latest + image: zabbix/zabbix-proxy-mysql:centos-3.4-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "centos" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:centos-latest + image: zabbix/zabbix-web-apache-pgsql:centos-3.4-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "centos" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:centos-latest + image: zabbix/zabbix-web-nginx-pgsql:centos-3.4-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "centos" zabbix-agent: - image: zabbix/zabbix-agent:centos-latest + image: zabbix/zabbix-agent:centos-3.4-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "centos" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:centos-latest + image: zabbix/zabbix-java-gateway:centos-3.4-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "centos" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest ports: - "162:162/udp" volumes: From 93d3ff421a9dff880e4adbc0c53e560cef2dbdb6 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 10:51:12 -0800 Subject: [PATCH 2/8] Updated Zabbix logo --- agent/alpine/Dockerfile | 10 +- agent/ubuntu/Dockerfile | 7 +- docker-compose_v2_alpine_mysql_latest.yaml | 16 +- docker-compose_v2_alpine_pgsql_latest.yaml | 14 +- docker-compose_v2_centos_mysql_latest.yaml | 16 +- ...r-compose_v2_centos_mysql_latest.yaml.orig | 285 ++++++++++++++++ docker-compose_v2_centos_pgsql_latest.yaml | 16 +- ...r-compose_v2_centos_pgsql_latest.yaml.orig | 304 ++++++++++++++++++ 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 +- kubernetes.yaml | 14 +- proxy-mysql/alpine/Dockerfile | 8 +- proxy-mysql/ubuntu/Dockerfile | 10 +- proxy-sqlite3/alpine/Dockerfile | 8 +- proxy-sqlite3/ubuntu/Dockerfile | 10 +- server-mysql/alpine/Dockerfile | 8 +- server-mysql/ubuntu/Dockerfile | 10 +- server-pgsql/alpine/Dockerfile | 8 +- server-pgsql/ubuntu/Dockerfile | 10 +- 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 +- 29 files changed, 729 insertions(+), 97 deletions(-) create mode 100644 docker-compose_v2_centos_mysql_latest.yaml.orig create mode 100644 docker-compose_v2_centos_pgsql_latest.yaml.orig diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 72ef3eb21..545e574dc 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -36,11 +36,12 @@ RUN addgroup zabbix && \ bash \ iputils \ libldap \ + pcre \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -55,9 +56,8 @@ RUN apk update && \ autoconf \ automake \ openssl-dev \ - openldap-dev \ - subversion \ - coreutils && \ + pcre-dev \ + subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ cd /tmp/zabbix-${ZBX_VERSION} && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index dcee51cdb..9396fed70 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -36,13 +36,14 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ + libpcre3 \ supervisor 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -57,6 +58,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ automake \ libc6-dev \ libldap2-dev \ + libpcre3-dev \ libssl-dev \ make \ pkg-config \ @@ -91,6 +93,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ autoconf \ automake \ libc6-dev \ + libpcre3-dev \ libssl-dev \ make \ pkg-config \ diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index 05a65dcb0..35614e856 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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..93de34b97 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-3.4-latest 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-3.4-latest 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-3.4-latest ports: - "10071:10051" volumes: @@ -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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_centos_mysql_latest.yaml b/docker-compose_v2_centos_mysql_latest.yaml index 1ad1ddc1f..b62f80e08 100644 --- a/docker-compose_v2_centos_mysql_latest.yaml +++ b/docker-compose_v2_centos_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:centos-3.4-latest + image: zabbix/zabbix-server-mysql:centos-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:centos-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:centos-3.4-latest + image: zabbix/zabbix-proxy-mysql:centos-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "centos" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:centos-3.4-latest + image: zabbix/zabbix-web-apache-mysql:centos-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "centos" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:centos-3.4-latest + image: zabbix/zabbix-web-nginx-mysql:centos-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "centos" zabbix-agent: - image: zabbix/zabbix-agent:centos-3.4-latest + image: zabbix/zabbix-agent:centos-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "centos" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:centos-3.4-latest + image: zabbix/zabbix-java-gateway:centos-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "centos" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_centos_mysql_latest.yaml.orig b/docker-compose_v2_centos_mysql_latest.yaml.orig new file mode 100644 index 000000000..1ad1ddc1f --- /dev/null +++ b/docker-compose_v2_centos_mysql_latest.yaml.orig @@ -0,0 +1,285 @@ +version: '2' +services: + zabbix-server: + image: zabbix/zabbix-server-mysql:centos-3.4-latest + ports: + - "10051:10051" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro + - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + volumes_from: + - zabbix-snmptraps:ro + links: + - mysql-server:mysql-server + - zabbix-java-gateway:zabbix-java-gateway + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + mem_limit: 512m + env_file: + - .env_db_mysql + - .env_srv + user: root + networks: + zbx_net: + aliases: + - zabbix-server + - zabbix-server-mysql + - zabbix-server-centos-mysql + - zabbix-server-mysql-centos + labels: + com.zabbix.description: "Zabbix server with MySQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-server" + com.zabbix.dbtype: "mysql" + com.zabbix.os: "centos" + + zabbix-proxy-sqlite3: + image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest + ports: + - "10061:10051" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + volumes_from: + - zabbix-snmptraps:ro + links: + - zabbix-server:zabbix-server + - zabbix-java-gateway:zabbix-java-gateway + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + mem_limit: 512m + env_file: + - .env_prx + - .env_prx_sqlite3 + user: root + networks: + zbx_net: + aliases: + - zabbix-proxy-sqlite3 + - zabbix-proxy-centos-sqlite3 + - zabbix-proxy-sqlite3-centos + labels: + com.zabbix.description: "Zabbix proxy with SQLite3 database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-proxy" + com.zabbix.dbtype: "sqlite3" + com.zabbix.os: "centos" + + zabbix-proxy-mysql: + image: zabbix/zabbix-proxy-mysql:centos-3.4-latest + ports: + - "10071:10051" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + volumes_from: + - zabbix-snmptraps:ro + links: + - zabbix-server:zabbix-server + - zabbix-java-gateway:zabbix-java-gateway + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + mem_limit: 512m + env_file: + - .env_db_mysql_proxy + - .env_prx + - .env_prx_mysql + user: root + networks: + zbx_net: + aliases: + - zabbix-proxy-mysql + - zabbix-proxy-centos-mysql + - zabbix-proxy-mysql-centos + labels: + com.zabbix.description: "Zabbix proxy with MySQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-proxy" + com.zabbix.dbtype: "mysql" + com.zabbix.os: "centos" + + zabbix-web-apache-mysql: + image: zabbix/zabbix-web-apache-mysql:centos-3.4-latest + ports: + - "80:80" + - "443:443" + links: + - mysql-server:mysql-server + - zabbix-server:zabbix-server + mem_limit: 512m + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro + env_file: + - .env_db_mysql + - .env_web + user: root + networks: + zbx_net: + aliases: + - zabbix-web-apache-mysql + - zabbix-web-apache-centos-mysql + - zabbix-web-apache-mysql-centos + labels: + com.zabbix.description: "Zabbix frontend on Apache web-server with MySQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-frontend" + com.zabbix.webserver: "apache2" + com.zabbix.dbtype: "mysql" + com.zabbix.os: "centos" + + zabbix-web-nginx-mysql: + image: zabbix/zabbix-web-nginx-mysql:centos-3.4-latest + ports: + - "8081:80" + - "8443:443" + links: + - mysql-server:mysql-server + - zabbix-server:zabbix-server + mem_limit: 512m + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro + env_file: + - .env_db_mysql + - .env_web + user: root + networks: + zbx_net: + aliases: + - zabbix-web-nginx-mysql + - zabbix-web-nginx-centos-mysql + - zabbix-web-nginx-mysql-centos + labels: + com.zabbix.description: "Zabbix frontend on Nginx web-server with MySQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-frontend" + com.zabbix.webserver: "nginx" + com.zabbix.dbtype: "mysql" + com.zabbix.os: "centos" + + zabbix-agent: + image: zabbix/zabbix-agent:centos-3.4-latest + ports: + - "10050:10050" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + links: + - zabbix-server:zabbix-server + env_file: + - .env_agent + user: root + privileged: true + pid: "host" + networks: + zbx_net: + aliases: + - zabbix-agent + - zabbix-agent-passive + - zabbix-agent-centos + labels: + com.zabbix.description: "Zabbix agent" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-agentd" + com.zabbix.os: "centos" + + zabbix-java-gateway: + image: zabbix/zabbix-java-gateway:centos-3.4-latest + ports: + - "10052:10052" + env_file: + - .env_java + user: root + networks: + zbx_net: + aliases: + - zabbix-java-gateway + - zabbix-java-gateway-centos + labels: + com.zabbix.description: "Zabbix Java Gateway" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "java-gateway" + com.zabbix.os: "centos" + + zabbix-snmptraps: + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + ports: + - "162:162/udp" + volumes: + - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw + user: root + networks: + zbx_net: + aliases: + - zabbix-snmptraps + labels: + com.zabbix.description: "Zabbix snmptraps" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "snmptraps" + com.zabbix.os: "ubuntu" + + mysql-server: + image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + volumes_from: + - db_data_mysql + volume_driver: local + env_file: + - .env_db_mysql + user: root + networks: + zbx_net: + aliases: + - mysql-server + - zabbix-database + - mysql-database + + db_data_mysql: + image: busybox + volumes: + - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw + +networks: + zbx_net: + driver: bridge + driver_opts: + com.docker.network.enable_ipv6: "false" + ipam: + driver: default + config: + - subnet: 172.16.238.0/24 + gateway: 172.16.238.1 +# - subnet: 2001:3984:3989::/64 +# gateway: 2001:3984:3989::1 diff --git a/docker-compose_v2_centos_pgsql_latest.yaml b/docker-compose_v2_centos_pgsql_latest.yaml index 2faac2e06..5a4894a98 100644 --- a/docker-compose_v2_centos_pgsql_latest.yaml +++ b/docker-compose_v2_centos_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:centos-3.4-latest + image: zabbix/zabbix-server-pgsql:centos-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:centos-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:centos-3.4-latest + image: zabbix/zabbix-proxy-mysql:centos-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "centos" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:centos-3.4-latest + image: zabbix/zabbix-web-apache-pgsql:centos-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "centos" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:centos-3.4-latest + image: zabbix/zabbix-web-nginx-pgsql:centos-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "centos" zabbix-agent: - image: zabbix/zabbix-agent:centos-3.4-latest + image: zabbix/zabbix-agent:centos-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "centos" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:centos-3.4-latest + image: zabbix/zabbix-java-gateway:centos-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "centos" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_centos_pgsql_latest.yaml.orig b/docker-compose_v2_centos_pgsql_latest.yaml.orig new file mode 100644 index 000000000..2faac2e06 --- /dev/null +++ b/docker-compose_v2_centos_pgsql_latest.yaml.orig @@ -0,0 +1,304 @@ +version: '2' +services: + zabbix-server: + image: zabbix/zabbix-server-pgsql:centos-3.4-latest + ports: + - "10051:10051" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro + - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + volumes_from: + - zabbix-snmptraps:ro + links: + - postgres-server:postgres-server + - zabbix-java-gateway:zabbix-java-gateway + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + mem_limit: 512m + env_file: + - .env_db_pgsql + - .env_srv + user: root + networks: + zbx_net: + aliases: + - zabbix-server + - zabbix-server-pgsql + - zabbix-server-centos-pgsql + - zabbix-server-pgsql-centos + labels: + com.zabbix.description: "Zabbix server with PostgreSQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-server" + com.zabbix.dbtype: "pgsql" + com.zabbix.os: "centos" + + zabbix-proxy-sqlite3: + image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest + ports: + - "10061:10051" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + volumes_from: + - zabbix-snmptraps:ro + links: + - zabbix-server:zabbix-server + - zabbix-java-gateway:zabbix-java-gateway + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + mem_limit: 512m + env_file: + - .env_prx + - .env_prx_sqlite3 + user: root + networks: + zbx_net: + aliases: + - zabbix-proxy-sqlite3 + - zabbix-proxy-centos-sqlite3 + - zabbix-proxy-sqlite3-centos + labels: + com.zabbix.description: "Zabbix proxy with SQLite3 database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-proxy" + com.zabbix.dbtype: "sqlite3" + com.zabbix.os: "centos" + + zabbix-proxy-mysql: + image: zabbix/zabbix-proxy-mysql:centos-3.4-latest + ports: + - "10071:10051" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro + volumes_from: + - zabbix-snmptraps:ro + links: + - zabbix-server:zabbix-server + - zabbix-java-gateway:zabbix-java-gateway + ulimits: + nproc: 65535 + nofile: + soft: 20000 + hard: 40000 + mem_limit: 512m + env_file: + - .env_db_mysql_proxy + - .env_prx + - .env_prx_mysql + user: root + networks: + zbx_net: + aliases: + - zabbix-proxy-mysql + - zabbix-proxy-centos-mysql + - zabbix-proxy-mysql-centos + labels: + com.zabbix.description: "Zabbix proxy with MySQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-proxy" + com.zabbix.dbtype: "mysql" + com.zabbix.os: "centos" + + zabbix-web-apache-pgsql: + image: zabbix/zabbix-web-apache-pgsql:centos-3.4-latest + ports: + - "80:80" + - "443:443" + links: + - postgres-server:postgres-server + - zabbix-server:zabbix-server + mem_limit: 512m + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro + env_file: + - .env_db_pgsql + - .env_web + user: root + networks: + zbx_net: + aliases: + - zabbix-web-apache-pgsql + - zabbix-web-apache-centos-pgsql + - zabbix-web-apache-pgsql-centos + labels: + com.zabbix.description: "Zabbix frontend on Apache web-server with PostgreSQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-frontend" + com.zabbix.webserver: "apache2" + com.zabbix.dbtype: "pgsql" + com.zabbix.os: "centos" + + zabbix-web-nginx-pgsql: + image: zabbix/zabbix-web-nginx-pgsql:centos-3.4-latest + ports: + - "8081:80" + - "8443:443" + links: + - postgres-server:postgres-server + - zabbix-server:zabbix-server + mem_limit: 512m + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro + env_file: + - .env_db_pgsql + - .env_web + user: root + networks: + zbx_net: + aliases: + - zabbix-web-nginx-pgsql + - zabbix-web-nginx-centos-pgsql + - zabbix-web-nginx-pgsql-centos + labels: + com.zabbix.description: "Zabbix frontend on Nginx web-server with PostgreSQL database support" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-frontend" + com.zabbix.webserver: "nginx" + com.zabbix.dbtype: "pgsql" + com.zabbix.os: "centos" + + zabbix-agent: + image: zabbix/zabbix-agent:centos-3.4-latest + ports: + - "10050:10050" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro + - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro + - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro + - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro + links: + - zabbix-server:zabbix-server + env_file: + - .env_agent + user: root + privileged: true + pid: "host" + networks: + zbx_net: + aliases: + - zabbix-agent + - zabbix-agent-passive + - zabbix-agent-centos + labels: + com.zabbix.description: "Zabbix agent" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-agentd" + com.zabbix.os: "centos" + + zabbix-java-gateway: + image: zabbix/zabbix-java-gateway:centos-3.4-latest + ports: + - "10052:10052" + env_file: + - .env_java + user: root + networks: + zbx_net: + aliases: + - zabbix-java-gateway + - zabbix-java-gateway-centos + labels: + com.zabbix.description: "Zabbix Java Gateway" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "java-gateway" + com.zabbix.os: "centos" + + zabbix-snmptraps: + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + ports: + - "162:162/udp" + volumes: + - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw + user: root + networks: + zbx_net: + aliases: + - zabbix-snmptraps + labels: + com.zabbix.description: "Zabbix snmptraps" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "snmptraps" + com.zabbix.os: "ubuntu" + + mysql-server: + image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] + volumes_from: + - db_data_mysql + volume_driver: local + env_file: + - .env_db_mysql + user: root + networks: + zbx_net: + aliases: + - mysql-server + - mysql-database + + postgres-server: + image: postgres:latest + volumes_from: + - db_data_pgsql + volume_driver: local + env_file: + - .env_db_pgsql + user: root + networks: + zbx_net: + aliases: + - postgres-server + - pgsql-server + - pgsql-database + + db_data_mysql: + image: busybox + volumes: + - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw + + db_data_pgsql: + image: busybox + volumes: + - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw + +networks: + zbx_net: + driver: bridge + driver_opts: + com.docker.network.enable_ipv6: "false" + ipam: + driver: default + config: + - subnet: 172.16.238.0/24 + gateway: 172.16.238.1 +# - subnet: 2001:3984:3989::/64 +# gateway: 2001:3984:3989::1 diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index 70e2b34bc..0d276ea45 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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..a4dba60b2 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest 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-3.4-latest ports: - "162:162/udp" volumes: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 4a5f6328b..71e2be20d 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -34,8 +34,8 @@ RUN addgroup zabbix && \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 673417e90..65d884fc8 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -39,8 +39,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/kubernetes.yaml b/kubernetes.yaml index 40e162483..d4db40aab 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -148,7 +148,7 @@ spec: spec: containers: - name: zabbix-web - image: zabbix/zabbix-web-nginx-mysql:alpine-latest + image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest imagePullPolicy: Always ports: - containerPort: 80 @@ -282,7 +282,7 @@ spec: spec: containers: - name: zabbix-server - image: zabbix/zabbix-server-mysql:alpine-latest + image: zabbix/zabbix-server-mysql:alpine-3.4-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -331,7 +331,7 @@ spec: mountPath: /var/lib/zabbix/snmptraps/ readOnly: true - name: zabbix-snmptraps - image: zabbix/zabbix-snmptraps:latest + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest imagePullPolicy: Always ports: - containerPort: 162 @@ -364,7 +364,7 @@ spec: spec: containers: - name: zabbix-proxy-sqlite3 - image: zabbix/zabbix-proxy-sqlite3:alpine-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -396,7 +396,7 @@ spec: spec: containers: - name: zabbix-proxy-mysql - image: zabbix/zabbix-proxy-mysql:alpine-latest + image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -439,7 +439,7 @@ spec: spec: containers: - name: zabbix-java-gateway - image: zabbix/zabbix-java-gateway:alpine-latest + image: zabbix/zabbix-java-gateway:alpine-3.4-latest imagePullPolicy: Always ports: - containerPort: 10052 @@ -470,7 +470,7 @@ spec: spec: containers: - name: zabbix-agent - image: zabbix/zabbix-agent:alpine-latest + image: zabbix/zabbix-agent:alpine-3.4-latest imagePullPolicy: Always resources: limits: diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 1942a7fd4..07b19f5fb 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -45,6 +45,7 @@ RUN addgroup zabbix && \ bash \ iputils \ libcurl \ + libevent \ libldap \ libssh2 \ libxml2 \ @@ -52,13 +53,14 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ + pcre \ supervisor \ unixodbc \ fping && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -72,12 +74,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ + libevent-dev \ libssh2-dev \ libxml2-dev \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ + pcre-dev \ subversion \ unixodbc-dev \ alpine-sdk && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 52c155846..17feae171 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -50,8 +50,10 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ + libevent-2.0 libmysqlclient18 \ libopenipmi0 \ + libpcre3 \ libsnmp30 \ libssh2-1 \ libssl1.0.0 \ @@ -64,8 +66,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -81,9 +83,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ + libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ @@ -134,9 +138,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ + libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 4a15f1126..84c1ee4c6 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -45,18 +45,20 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ + libevent \ libldap \ libssh2 \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ + pcre \ sqlite-libs \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -71,11 +73,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ + libevent-dev \ libssh2-dev \ libxml2-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ + pcre-dev \ sqlite-dev \ subversion \ unixodbc-dev && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 58f8311a7..5c25a7bb2 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,7 +49,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ + libevent-2.0 \ libopenipmi0 \ + libpcre3 \ libsnmp30 \ libsqlite3-0 \ libssh2-1 \ @@ -62,8 +64,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -79,8 +81,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libldap2-dev \ libopenipmi-dev \ + libpcre3-dev \ libsnmp-dev \ libsqlite3-dev \ libssh2-1-dev \ @@ -129,8 +133,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libldap2-dev \ libopenipmi-dev \ + libpcre3-dev \ libsnmp-dev \ libsqlite3-dev \ libssh2-1-dev \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index df0ae88c1..02792d6e9 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,6 +48,7 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ + libevent \ libldap \ libssh2 \ libxml2 \ @@ -55,12 +56,13 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ + pcre \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -75,12 +77,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ + libevent-dev \ libssh2-dev \ libxml2-dev \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ + pcre-dev \ subversion \ unixodbc-dev && \ cd /tmp/ && \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 72d483ec5..e13d4746a 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,9 +52,11 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 + libevent-2.0 \ libiksemel3 \ libmysqlclient18 \ libopenipmi0 \ + libpcre3 \ libsnmp30 \ libssh2-1 \ libssl1.0.0 \ @@ -67,8 +69,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -84,10 +86,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libiksemel-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ + libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ @@ -141,10 +145,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libiksemel-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ + libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 60310b3b5..8f099d346 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,19 +48,21 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ + libevent \ libldap \ libssh2 \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ + pcre \ postgresql-client \ postgresql-libs \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -75,11 +77,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ + libevent-dev \ libssh2-dev \ libxml2-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ + pcre-dev \ postgresql-dev \ subversion \ unixodbc-dev && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index cb53966ae..25807a008 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,8 +52,10 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ + libevent-2.0 \ libiksemel3 \ libopenipmi0 \ + libpcre3 \ libpq5 \ libsnmp30 \ libssh2-1 \ @@ -67,8 +69,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -84,9 +86,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libiksemel-dev \ libldap2-dev \ libopenipmi-dev \ + libpcre3-dev \ libpq-dev \ libsnmp-dev \ libssh2-1-dev \ @@ -141,9 +145,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ + libevent-dev \ libiksemel-dev \ libldap2-dev \ libopenipmi-dev \ + libpcre3-dev \ libpq-dev \ libsnmp-dev \ libssh2-1-dev \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index b9cda45bb..1e771517c 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -51,8 +51,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 624d255de..d86480ff4 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 7f1cc5a5c..19cd05ee2 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -50,8 +50,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 2cadc2a5f..ea294e8bb 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 4cde87fa0..61176cc18 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -50,8 +50,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 1c2ff133b..a259e6b62 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -58,8 +58,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index b23f4e4c0..9c1d331df 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -49,8 +49,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index f6c15d2b3..53db607b9 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From b12db761556bb532c81128b7b68a5ea90dcb6d9d Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 10:51:57 -0800 Subject: [PATCH 3/8] Updated Zabbix logo --- ...r-compose_v2_centos_mysql_latest.yaml.orig | 285 ---------------- ...r-compose_v2_centos_pgsql_latest.yaml.orig | 304 ------------------ 2 files changed, 589 deletions(-) delete mode 100644 docker-compose_v2_centos_mysql_latest.yaml.orig delete mode 100644 docker-compose_v2_centos_pgsql_latest.yaml.orig diff --git a/docker-compose_v2_centos_mysql_latest.yaml.orig b/docker-compose_v2_centos_mysql_latest.yaml.orig deleted file mode 100644 index 1ad1ddc1f..000000000 --- a/docker-compose_v2_centos_mysql_latest.yaml.orig +++ /dev/null @@ -1,285 +0,0 @@ -version: '2' -services: - zabbix-server: - image: zabbix/zabbix-server-mysql:centos-3.4-latest - ports: - - "10051:10051" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - volumes_from: - - zabbix-snmptraps:ro - links: - - mysql-server:mysql-server - - zabbix-java-gateway:zabbix-java-gateway - ulimits: - nproc: 65535 - nofile: - soft: 20000 - hard: 40000 - mem_limit: 512m - env_file: - - .env_db_mysql - - .env_srv - user: root - networks: - zbx_net: - aliases: - - zabbix-server - - zabbix-server-mysql - - zabbix-server-centos-mysql - - zabbix-server-mysql-centos - labels: - com.zabbix.description: "Zabbix server with MySQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-server" - com.zabbix.dbtype: "mysql" - com.zabbix.os: "centos" - - zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest - ports: - - "10061:10051" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - volumes_from: - - zabbix-snmptraps:ro - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway - ulimits: - nproc: 65535 - nofile: - soft: 20000 - hard: 40000 - mem_limit: 512m - env_file: - - .env_prx - - .env_prx_sqlite3 - user: root - networks: - zbx_net: - aliases: - - zabbix-proxy-sqlite3 - - zabbix-proxy-centos-sqlite3 - - zabbix-proxy-sqlite3-centos - labels: - com.zabbix.description: "Zabbix proxy with SQLite3 database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-proxy" - com.zabbix.dbtype: "sqlite3" - com.zabbix.os: "centos" - - zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:centos-3.4-latest - ports: - - "10071:10051" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - volumes_from: - - zabbix-snmptraps:ro - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway - ulimits: - nproc: 65535 - nofile: - soft: 20000 - hard: 40000 - mem_limit: 512m - env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql - user: root - networks: - zbx_net: - aliases: - - zabbix-proxy-mysql - - zabbix-proxy-centos-mysql - - zabbix-proxy-mysql-centos - labels: - com.zabbix.description: "Zabbix proxy with MySQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-proxy" - com.zabbix.dbtype: "mysql" - com.zabbix.os: "centos" - - zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:centos-3.4-latest - ports: - - "80:80" - - "443:443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server - mem_limit: 512m - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - env_file: - - .env_db_mysql - - .env_web - user: root - networks: - zbx_net: - aliases: - - zabbix-web-apache-mysql - - zabbix-web-apache-centos-mysql - - zabbix-web-apache-mysql-centos - labels: - com.zabbix.description: "Zabbix frontend on Apache web-server with MySQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-frontend" - com.zabbix.webserver: "apache2" - com.zabbix.dbtype: "mysql" - com.zabbix.os: "centos" - - zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:centos-3.4-latest - ports: - - "8081:80" - - "8443:443" - links: - - mysql-server:mysql-server - - zabbix-server:zabbix-server - mem_limit: 512m - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - env_file: - - .env_db_mysql - - .env_web - user: root - networks: - zbx_net: - aliases: - - zabbix-web-nginx-mysql - - zabbix-web-nginx-centos-mysql - - zabbix-web-nginx-mysql-centos - labels: - com.zabbix.description: "Zabbix frontend on Nginx web-server with MySQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-frontend" - com.zabbix.webserver: "nginx" - com.zabbix.dbtype: "mysql" - com.zabbix.os: "centos" - - zabbix-agent: - image: zabbix/zabbix-agent:centos-3.4-latest - ports: - - "10050:10050" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server - env_file: - - .env_agent - user: root - privileged: true - pid: "host" - networks: - zbx_net: - aliases: - - zabbix-agent - - zabbix-agent-passive - - zabbix-agent-centos - labels: - com.zabbix.description: "Zabbix agent" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-agentd" - com.zabbix.os: "centos" - - zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:centos-3.4-latest - ports: - - "10052:10052" - env_file: - - .env_java - user: root - networks: - zbx_net: - aliases: - - zabbix-java-gateway - - zabbix-java-gateway-centos - labels: - com.zabbix.description: "Zabbix Java Gateway" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "java-gateway" - com.zabbix.os: "centos" - - zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest - ports: - - "162:162/udp" - volumes: - - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - user: root - networks: - zbx_net: - aliases: - - zabbix-snmptraps - labels: - com.zabbix.description: "Zabbix snmptraps" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" - - mysql-server: - image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] - volumes_from: - - db_data_mysql - volume_driver: local - env_file: - - .env_db_mysql - user: root - networks: - zbx_net: - aliases: - - mysql-server - - zabbix-database - - mysql-database - - db_data_mysql: - image: busybox - volumes: - - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - -networks: - zbx_net: - driver: bridge - driver_opts: - com.docker.network.enable_ipv6: "false" - ipam: - driver: default - config: - - subnet: 172.16.238.0/24 - gateway: 172.16.238.1 -# - subnet: 2001:3984:3989::/64 -# gateway: 2001:3984:3989::1 diff --git a/docker-compose_v2_centos_pgsql_latest.yaml.orig b/docker-compose_v2_centos_pgsql_latest.yaml.orig deleted file mode 100644 index 2faac2e06..000000000 --- a/docker-compose_v2_centos_pgsql_latest.yaml.orig +++ /dev/null @@ -1,304 +0,0 @@ -version: '2' -services: - zabbix-server: - image: zabbix/zabbix-server-pgsql:centos-3.4-latest - ports: - - "10051:10051" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - volumes_from: - - zabbix-snmptraps:ro - links: - - postgres-server:postgres-server - - zabbix-java-gateway:zabbix-java-gateway - ulimits: - nproc: 65535 - nofile: - soft: 20000 - hard: 40000 - mem_limit: 512m - env_file: - - .env_db_pgsql - - .env_srv - user: root - networks: - zbx_net: - aliases: - - zabbix-server - - zabbix-server-pgsql - - zabbix-server-centos-pgsql - - zabbix-server-pgsql-centos - labels: - com.zabbix.description: "Zabbix server with PostgreSQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-server" - com.zabbix.dbtype: "pgsql" - com.zabbix.os: "centos" - - zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:centos-3.4-latest - ports: - - "10061:10051" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - volumes_from: - - zabbix-snmptraps:ro - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway - ulimits: - nproc: 65535 - nofile: - soft: 20000 - hard: 40000 - mem_limit: 512m - env_file: - - .env_prx - - .env_prx_sqlite3 - user: root - networks: - zbx_net: - aliases: - - zabbix-proxy-sqlite3 - - zabbix-proxy-centos-sqlite3 - - zabbix-proxy-sqlite3-centos - labels: - com.zabbix.description: "Zabbix proxy with SQLite3 database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-proxy" - com.zabbix.dbtype: "sqlite3" - com.zabbix.os: "centos" - - zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:centos-3.4-latest - ports: - - "10071:10051" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - volumes_from: - - zabbix-snmptraps:ro - links: - - zabbix-server:zabbix-server - - zabbix-java-gateway:zabbix-java-gateway - ulimits: - nproc: 65535 - nofile: - soft: 20000 - hard: 40000 - mem_limit: 512m - env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql - user: root - networks: - zbx_net: - aliases: - - zabbix-proxy-mysql - - zabbix-proxy-centos-mysql - - zabbix-proxy-mysql-centos - labels: - com.zabbix.description: "Zabbix proxy with MySQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-proxy" - com.zabbix.dbtype: "mysql" - com.zabbix.os: "centos" - - zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:centos-3.4-latest - ports: - - "80:80" - - "443:443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server - mem_limit: 512m - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - env_file: - - .env_db_pgsql - - .env_web - user: root - networks: - zbx_net: - aliases: - - zabbix-web-apache-pgsql - - zabbix-web-apache-centos-pgsql - - zabbix-web-apache-pgsql-centos - labels: - com.zabbix.description: "Zabbix frontend on Apache web-server with PostgreSQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-frontend" - com.zabbix.webserver: "apache2" - com.zabbix.dbtype: "pgsql" - com.zabbix.os: "centos" - - zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:centos-3.4-latest - ports: - - "8081:80" - - "8443:443" - links: - - postgres-server:postgres-server - - zabbix-server:zabbix-server - mem_limit: 512m - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - env_file: - - .env_db_pgsql - - .env_web - user: root - networks: - zbx_net: - aliases: - - zabbix-web-nginx-pgsql - - zabbix-web-nginx-centos-pgsql - - zabbix-web-nginx-pgsql-centos - labels: - com.zabbix.description: "Zabbix frontend on Nginx web-server with PostgreSQL database support" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-frontend" - com.zabbix.webserver: "nginx" - com.zabbix.dbtype: "pgsql" - com.zabbix.os: "centos" - - zabbix-agent: - image: zabbix/zabbix-agent:centos-3.4-latest - ports: - - "10050:10050" - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - links: - - zabbix-server:zabbix-server - env_file: - - .env_agent - user: root - privileged: true - pid: "host" - networks: - zbx_net: - aliases: - - zabbix-agent - - zabbix-agent-passive - - zabbix-agent-centos - labels: - com.zabbix.description: "Zabbix agent" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-agentd" - com.zabbix.os: "centos" - - zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:centos-3.4-latest - ports: - - "10052:10052" - env_file: - - .env_java - user: root - networks: - zbx_net: - aliases: - - zabbix-java-gateway - - zabbix-java-gateway-centos - labels: - com.zabbix.description: "Zabbix Java Gateway" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "java-gateway" - com.zabbix.os: "centos" - - zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest - ports: - - "162:162/udp" - volumes: - - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw - user: root - networks: - zbx_net: - aliases: - - zabbix-snmptraps - labels: - com.zabbix.description: "Zabbix snmptraps" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "snmptraps" - com.zabbix.os: "ubuntu" - - mysql-server: - image: mysql:5.7 - command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] - volumes_from: - - db_data_mysql - volume_driver: local - env_file: - - .env_db_mysql - user: root - networks: - zbx_net: - aliases: - - mysql-server - - mysql-database - - postgres-server: - image: postgres:latest - volumes_from: - - db_data_pgsql - volume_driver: local - env_file: - - .env_db_pgsql - user: root - networks: - zbx_net: - aliases: - - postgres-server - - pgsql-server - - pgsql-database - - db_data_mysql: - image: busybox - volumes: - - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw - - db_data_pgsql: - image: busybox - volumes: - - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - -networks: - zbx_net: - driver: bridge - driver_opts: - com.docker.network.enable_ipv6: "false" - ipam: - driver: default - config: - - subnet: 172.16.238.0/24 - gateway: 172.16.238.1 -# - subnet: 2001:3984:3989::/64 -# gateway: 2001:3984:3989::1 From a60fdb8a050385ad80184779faf5b6ddcecb95e3 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 11:22:21 -0800 Subject: [PATCH 4/8] CentOS image update --- agent/centos/Dockerfile | 4 ++-- java-gateway/centos/Dockerfile | 4 ++-- proxy-mysql/centos/Dockerfile | 4 ++-- proxy-sqlite3/centos/Dockerfile | 4 ++-- server-mysql/centos/Dockerfile | 4 ++-- server-pgsql/centos/Dockerfile | 4 ++-- web-apache-mysql/centos/Dockerfile | 4 ++-- web-apache-pgsql/centos/Dockerfile | 4 ++-- web-nginx-mysql/centos/Dockerfile | 4 ++-- web-nginx-pgsql/centos/Dockerfile | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 43eb67250..0ba044cf5 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -40,8 +40,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index a4d5a7037..3e63387cc 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -35,8 +35,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 290c2aea9..231f9b980 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -57,8 +57,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index a23f30fc4..8142aa31b 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -56,8 +56,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index acac1e996..3792032b7 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -59,8 +59,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 9174a0e62..27cc4497d 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -61,8 +61,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 6d4040a2f..de6496ffd 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -46,8 +46,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 9de29db13..5e8536d1c 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -46,8 +46,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 48c2f5cf2..876561e06 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -49,8 +49,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 43439a183..bfe236405 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -48,8 +48,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From f81b71941abb844c0b4715cb8105f8e1f17845ac Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 12:11:35 -0800 Subject: [PATCH 5/8] CentOS image update --- proxy-mysql/centos/Dockerfile | 2 ++ proxy-sqlite3/centos/Dockerfile | 2 ++ server-mysql/centos/Dockerfile | 2 ++ server-pgsql/centos/Dockerfile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 231f9b980..6a8a4d323 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -45,6 +45,7 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} install \ fping \ libcurl \ + libevent \ libxml2 \ mariadb \ net-snmp-libs \ @@ -73,6 +74,7 @@ RUN yum --quiet makecache && \ automake \ gcc \ libcurl-devel \ + libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 8142aa31b..03652409b 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -45,6 +45,7 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} install \ fping \ libcurl \ + libevent \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -72,6 +73,7 @@ RUN yum --quiet makecache && \ automake \ gcc \ libcurl-devel \ + libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 3792032b7..45f1b7aca 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -47,6 +47,7 @@ RUN groupadd --system zabbix && \ fping \ iksemel \ libcurl \ + libevent \ libxml2 \ mariadb \ net-snmp-libs \ @@ -76,6 +77,7 @@ RUN yum --quiet makecache && \ gcc \ iksemel-devel \ libcurl-devel \ + libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 27cc4497d..ed7dd16f4 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -48,6 +48,7 @@ RUN groupadd --system zabbix && \ fping \ iksemel \ libcurl \ + libevent \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -78,6 +79,7 @@ RUN yum --quiet makecache && \ gcc \ iksemel-devel \ libcurl-devel \ + libevent-devel \ libssh2-devel \ libxml2-devel \ make \ From 755ea90c5f76cd4b4511f8f4f17bc314221de3c8 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 15:33:38 -0800 Subject: [PATCH 6/8] Fixed issue with proxy-mysql image --- proxy-mysql/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 17feae171..345085529 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -50,7 +50,7 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 + libevent-2.0 \ libmysqlclient18 \ libopenipmi0 \ libpcre3 \ From 745f51ee3a0bf57269b85825723b91d3f2893e64 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 15:49:51 -0800 Subject: [PATCH 7/8] Fixed issue with proxy-mysql image --- server-mysql/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index e13d4746a..a4eaf3a58 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -51,7 +51,7 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ - libcurl3 + libcurl3 \ libevent-2.0 \ libiksemel3 \ libmysqlclient18 \ From 1be48137331ba0e13c5e2d8a6f6beb42b2c7d836 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 16:12:34 -0800 Subject: [PATCH 8/8] Revert "Merge branch '3.4' into master" This reverts commit e3dd84539654799f7e712b6da27f13c6a98141a7, reversing changes made to 461f869a4a2a6a9f73111df87f55511e27f0f75e. --- agent/alpine/Dockerfile | 10 +++++----- agent/centos/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 7 ++----- docker-compose_v2_alpine_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_alpine_pgsql_latest.yaml | 14 +++++++------- docker-compose_v2_ubuntu_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_pgsql_latest.yaml | 16 ++++++++-------- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/centos/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- kubernetes.yaml | 14 +++++++------- proxy-mysql/alpine/Dockerfile | 8 ++------ proxy-mysql/centos/Dockerfile | 6 ++---- proxy-mysql/ubuntu/Dockerfile | 10 ++-------- proxy-sqlite3/alpine/Dockerfile | 8 ++------ proxy-sqlite3/centos/Dockerfile | 6 ++---- proxy-sqlite3/ubuntu/Dockerfile | 10 ++-------- server-mysql/alpine/Dockerfile | 8 ++------ server-mysql/centos/Dockerfile | 6 ++---- server-mysql/ubuntu/Dockerfile | 10 ++-------- server-pgsql/alpine/Dockerfile | 8 ++------ server-pgsql/centos/Dockerfile | 6 ++---- server-pgsql/ubuntu/Dockerfile | 10 ++-------- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/centos/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/centos/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/centos/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/centos/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 35 files changed, 101 insertions(+), 152 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 545e574dc..72ef3eb21 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -36,12 +36,11 @@ RUN addgroup zabbix && \ bash \ iputils \ libldap \ - pcre \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -56,8 +55,9 @@ RUN apk update && \ autoconf \ automake \ openssl-dev \ - pcre-dev \ - subversion && \ + openldap-dev \ + subversion \ + coreutils && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ cd /tmp/zabbix-${ZBX_VERSION} && \ diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 0ba044cf5..43eb67250 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -40,8 +40,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 9396fed70..dcee51cdb 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -36,14 +36,13 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ - libpcre3 \ supervisor 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -58,7 +57,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ automake \ libc6-dev \ libldap2-dev \ - libpcre3-dev \ libssl-dev \ make \ pkg-config \ @@ -93,7 +91,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ autoconf \ automake \ libc6-dev \ - libpcre3-dev \ libssl-dev \ make \ pkg-config \ diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index 35614e856..05a65dcb0 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-3.4-latest + image: zabbix/zabbix-server-mysql:alpine-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest + image: zabbix/zabbix-proxy-mysql:alpine-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:alpine-3.4-latest + image: zabbix/zabbix-web-apache-mysql:alpine-latest 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-3.4-latest + image: zabbix/zabbix-web-nginx-mysql:alpine-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-3.4-latest + image: zabbix/zabbix-agent:alpine-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-3.4-latest + image: zabbix/zabbix-java-gateway:alpine-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml index 93de34b97..39ede361f 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-3.4-latest + image: zabbix/zabbix-server-pgsql:alpine-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest + image: zabbix/zabbix-proxy-mysql:alpine-latest ports: - "10071:10051" volumes: @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:alpine-3.4-latest + image: zabbix/zabbix-web-nginx-pgsql:alpine-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-3.4-latest + image: zabbix/zabbix-agent:alpine-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-3.4-latest + image: zabbix/zabbix-java-gateway:alpine-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index 0d276ea45..70e2b34bc 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-3.4-latest + image: zabbix/zabbix-server-mysql:ubuntu-latest ports: - "10051:10051" volumes: @@ -44,7 +44,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest ports: - "10061:10051" volumes: @@ -84,7 +84,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest + image: zabbix/zabbix-proxy-mysql:ubuntu-latest ports: - "10071:10051" volumes: @@ -125,7 +125,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:ubuntu-3.4-latest + image: zabbix/zabbix-web-apache-mysql:ubuntu-latest 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-3.4-latest + image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest ports: - "8081:80" - "8443:443" @@ -187,7 +187,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-3.4-latest + image: zabbix/zabbix-agent:ubuntu-latest ports: - "10050:10050" volumes: @@ -217,7 +217,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest + image: zabbix/zabbix-java-gateway:ubuntu-latest ports: - "10052:10052" env_file: @@ -235,7 +235,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index a4dba60b2..713a2e4f1 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-3.4-latest + image: zabbix/zabbix-server-pgsql:ubuntu-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest + image: zabbix/zabbix-proxy-mysql:ubuntu-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:ubuntu-3.4-latest + image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest 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-3.4-latest + image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-3.4-latest + image: zabbix/zabbix-agent:ubuntu-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest + image: zabbix/zabbix-java-gateway:ubuntu-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 71e2be20d..4a5f6328b 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -34,8 +34,8 @@ RUN addgroup zabbix && \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index 3e63387cc..a4d5a7037 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -35,8 +35,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 65d884fc8..673417e90 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -39,8 +39,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/kubernetes.yaml b/kubernetes.yaml index d4db40aab..40e162483 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -148,7 +148,7 @@ spec: spec: containers: - name: zabbix-web - image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest + image: zabbix/zabbix-web-nginx-mysql:alpine-latest imagePullPolicy: Always ports: - containerPort: 80 @@ -282,7 +282,7 @@ spec: spec: containers: - name: zabbix-server - image: zabbix/zabbix-server-mysql:alpine-3.4-latest + image: zabbix/zabbix-server-mysql:alpine-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -331,7 +331,7 @@ spec: mountPath: /var/lib/zabbix/snmptraps/ readOnly: true - name: zabbix-snmptraps - image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest + image: zabbix/zabbix-snmptraps:latest imagePullPolicy: Always ports: - containerPort: 162 @@ -364,7 +364,7 @@ spec: spec: containers: - name: zabbix-proxy-sqlite3 - image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -396,7 +396,7 @@ spec: spec: containers: - name: zabbix-proxy-mysql - image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest + image: zabbix/zabbix-proxy-mysql:alpine-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -439,7 +439,7 @@ spec: spec: containers: - name: zabbix-java-gateway - image: zabbix/zabbix-java-gateway:alpine-3.4-latest + image: zabbix/zabbix-java-gateway:alpine-latest imagePullPolicy: Always ports: - containerPort: 10052 @@ -470,7 +470,7 @@ spec: spec: containers: - name: zabbix-agent - image: zabbix/zabbix-agent:alpine-3.4-latest + image: zabbix/zabbix-agent:alpine-latest imagePullPolicy: Always resources: limits: diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 07b19f5fb..1942a7fd4 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -45,7 +45,6 @@ RUN addgroup zabbix && \ bash \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ @@ -53,14 +52,13 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ supervisor \ unixodbc \ fping && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -74,14 +72,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ subversion \ unixodbc-dev \ alpine-sdk && \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 6a8a4d323..290c2aea9 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -45,7 +45,6 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} install \ fping \ libcurl \ - libevent \ libxml2 \ mariadb \ net-snmp-libs \ @@ -58,8 +57,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -74,7 +73,6 @@ RUN yum --quiet makecache && \ automake \ gcc \ libcurl-devel \ - libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 345085529..52c155846 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -50,10 +50,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 \ libmysqlclient18 \ libopenipmi0 \ - libpcre3 \ libsnmp30 \ libssh2-1 \ libssl1.0.0 \ @@ -66,8 +64,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -83,11 +81,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ @@ -138,11 +134,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 84c1ee4c6..4a15f1126 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -45,20 +45,18 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ sqlite-libs \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -73,13 +71,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ sqlite-dev \ subversion \ unixodbc-dev && \ diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 03652409b..a23f30fc4 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -45,7 +45,6 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} install \ fping \ libcurl \ - libevent \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -57,8 +56,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -73,7 +72,6 @@ RUN yum --quiet makecache && \ automake \ gcc \ libcurl-devel \ - libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 5c25a7bb2..58f8311a7 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,9 +49,7 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 \ libopenipmi0 \ - libpcre3 \ libsnmp30 \ libsqlite3-0 \ libssh2-1 \ @@ -64,8 +62,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -81,10 +79,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libsqlite3-dev \ libssh2-1-dev \ @@ -133,10 +129,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libsqlite3-dev \ libssh2-1-dev \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 02792d6e9..df0ae88c1 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,6 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ @@ -56,13 +55,12 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -77,14 +75,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ subversion \ unixodbc-dev && \ cd /tmp/ && \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 45f1b7aca..acac1e996 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -47,7 +47,6 @@ RUN groupadd --system zabbix && \ fping \ iksemel \ libcurl \ - libevent \ libxml2 \ mariadb \ net-snmp-libs \ @@ -60,8 +59,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -77,7 +76,6 @@ RUN yum --quiet makecache && \ gcc \ iksemel-devel \ libcurl-devel \ - libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index a4eaf3a58..d2395a461 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,11 +52,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 \ libiksemel3 \ libmysqlclient18 \ libopenipmi0 \ - libpcre3 \ libsnmp30 \ libssh2-1 \ libssl1.0.0 \ @@ -69,8 +67,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -86,12 +84,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ @@ -145,12 +141,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 8f099d346..60310b3b5 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,21 +48,19 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ postgresql-client \ postgresql-libs \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -77,13 +75,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ postgresql-dev \ subversion \ unixodbc-dev && \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index ed7dd16f4..9174a0e62 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -48,7 +48,6 @@ RUN groupadd --system zabbix && \ fping \ iksemel \ libcurl \ - libevent \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -62,8 +61,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -79,7 +78,6 @@ RUN yum --quiet makecache && \ gcc \ iksemel-devel \ libcurl-devel \ - libevent-devel \ libssh2-devel \ libxml2-devel \ make \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 25807a008..cb53966ae 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,10 +52,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 \ libiksemel3 \ libopenipmi0 \ - libpcre3 \ libpq5 \ libsnmp30 \ libssh2-1 \ @@ -69,8 +67,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} @@ -86,11 +84,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libpq-dev \ libsnmp-dev \ libssh2-1-dev \ @@ -145,11 +141,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libpq-dev \ libsnmp-dev \ libssh2-1-dev \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 1e771517c..b9cda45bb 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -51,8 +51,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index de6496ffd..6d4040a2f 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -46,8 +46,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index d86480ff4..624d255de 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 19cd05ee2..7f1cc5a5c 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -50,8 +50,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 5e8536d1c..9de29db13 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -46,8 +46,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index ea294e8bb..2cadc2a5f 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 61176cc18..4cde87fa0 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -50,8 +50,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 876561e06..48c2f5cf2 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -49,8 +49,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index a259e6b62..1c2ff133b 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -58,8 +58,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 9c1d331df..b23f4e4c0 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -49,8 +49,8 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index bfe236405..43439a183 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -48,8 +48,8 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 53db607b9..f6c15d2b3 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.6 +ARG MAJOR_VERSION=master +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}