From ec613786c98b2a64f1884db03cc09efaee4c7e5c Mon Sep 17 00:00:00 2001 From: dotneft Date: Fri, 28 Oct 2016 07:09:29 -0700 Subject: [PATCH 01/20] Trunk update --- agent/alpine/Dockerfile | 4 +- agent/ubuntu/Dockerfile | 4 +- docker-compose_v2_alpine_mysql_local.yaml | 292 ---------------- ... docker-compose_v2_alpine_mysql_trunk.yaml | 16 +- docker-compose_v2_alpine_pgsql_local.yaml | 312 ------------------ ... docker-compose_v2_alpine_pgsql_trunk.yaml | 16 +- docker-compose_v2_ubuntu_mysql_local.yaml | 293 ---------------- ... docker-compose_v2_ubuntu_mysql_trunk.yaml | 19 +- docker-compose_v2_ubuntu_pgsql_local.yaml | 311 ----------------- ... docker-compose_v2_ubuntu_pgsql_trunk.yaml | 17 +- java-gateway/alpine/Dockerfile | 4 +- java-gateway/ubuntu/Dockerfile | 4 +- proxy-mysql/alpine/Dockerfile | 4 +- proxy-mysql/ubuntu/Dockerfile | 4 +- proxy-sqlite3/alpine/Dockerfile | 4 +- proxy-sqlite3/ubuntu/Dockerfile | 4 +- server-mysql/alpine/Dockerfile | 4 +- server-mysql/ubuntu/Dockerfile | 4 +- server-pgsql/alpine/Dockerfile | 4 +- server-pgsql/ubuntu/Dockerfile | 4 +- web-apache-mysql/alpine/Dockerfile | 4 +- web-apache-mysql/ubuntu/Dockerfile | 4 +- web-apache-pgsql/alpine/Dockerfile | 4 +- web-apache-pgsql/ubuntu/Dockerfile | 4 +- web-nginx-mysql/alpine/Dockerfile | 4 +- web-nginx-mysql/ubuntu/Dockerfile | 4 +- web-nginx-pgsql/alpine/Dockerfile | 4 +- web-nginx-pgsql/ubuntu/Dockerfile | 4 +- 28 files changed, 75 insertions(+), 1281 deletions(-) delete mode 100644 docker-compose_v2_alpine_mysql_local.yaml rename docker-compose_v2_alpine_mysql_latest.yaml => docker-compose_v2_alpine_mysql_trunk.yaml (94%) delete mode 100644 docker-compose_v2_alpine_pgsql_local.yaml rename docker-compose_v2_alpine_pgsql_latest.yaml => docker-compose_v2_alpine_pgsql_trunk.yaml (94%) delete mode 100644 docker-compose_v2_ubuntu_mysql_local.yaml rename docker-compose_v2_ubuntu_mysql_latest.yaml => docker-compose_v2_ubuntu_mysql_trunk.yaml (94%) delete mode 100644 docker-compose_v2_ubuntu_pgsql_local.yaml rename docker-compose_v2_ubuntu_pgsql_latest.yaml => docker-compose_v2_ubuntu_pgsql_trunk.yaml (94%) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 65a31968c..397776195 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -25,8 +25,8 @@ RUN addgroup zabbix && \ libssl1.0 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 c14098a8f..1ea19d9da 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -30,8 +30,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/docker-compose_v2_alpine_mysql_local.yaml b/docker-compose_v2_alpine_mysql_local.yaml deleted file mode 100644 index d5e25a8ac..000000000 --- a/docker-compose_v2_alpine_mysql_local.yaml +++ /dev/null @@ -1,292 +0,0 @@ -version: '2' -services: - zabbix-server: - build: ./server-mysql/alpine - image: zabbix-server-mysql:alpine-local - 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-alpine-mysql - - zabbix-server-mysql-alpine - 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: "alpine" - - zabbix-proxy-sqlite3: - build: ./proxy-sqlite3/alpine - image: zabbix-proxy-sqlite3:alpine-local - 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-alpine-sqlite3 - - zabbix-proxy-sqlite3-alpine - 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: "alpine" - - zabbix-proxy-mysql: - build: ./proxy-mysql/alpine - image: zabbix-proxy-mysql:alpine-local - 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-alpine-mysql - - zabbix-proxy-mysql-alpine - 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: "alpine" - - zabbix-web-apache-mysql: - build: ./web-apache-mysql/alpine - image: zabbix-web-apache-mysql:alpine-local - 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-alpine-mysql - - zabbix-web-apache-mysql-alpine - 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: "alpine" - - zabbix-web-nginx-mysql: - build: ./web-nginx-mysql/alpine - image: zabbix-web-nginx-mysql:alpine-local - 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-alpine-mysql - - zabbix-web-nginx-mysql-alpine - 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: "alpine" - - zabbix-agent: - build: ./agent/alpine - image: zabbix-agent:alpine-local - 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-alpine - labels: - com.zabbix.description: "Zabbix agent" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-agentd" - com.zabbix.os: "alpine" - - zabbix-java-gateway: - build: ./java-gateway/alpine - image: zabbix-java-gateway:alpine-local - ports: - - "10052:10052" - env_file: - - .env_java - user: root - networks: - zbx_net: - aliases: - - zabbix-java-gateway - - zabbix-java-gateway-alpine - labels: - com.zabbix.description: "Zabbix Java Gateway" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "java-gateway" - com.zabbix.os: "alpine" - - zabbix-snmptraps: - build: ./snmptraps/ubuntu - image: zabbix-snmptraps:ubuntu-local - 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 - 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_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_trunk.yaml similarity index 94% rename from docker-compose_v2_alpine_mysql_latest.yaml rename to docker-compose_v2_alpine_mysql_trunk.yaml index d9e9c0f38..f9fc22b4b 100644 --- a/docker-compose_v2_alpine_mysql_latest.yaml +++ b/docker-compose_v2_alpine_mysql_trunk.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:alpine-latest + image: zabbix/zabbix-server-mysql:alpine-trunk ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-trunk ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-latest + image: zabbix/zabbix-proxy-mysql:alpine-trunk ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:alpine-latest + image: zabbix/zabbix-web-apache-mysql:alpine-trunk ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:alpine-latest + image: zabbix/zabbix-web-nginx-mysql:alpine-trunk ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-latest + image: zabbix/zabbix-agent:alpine-trunk ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-latest + image: zabbix/zabbix-java-gateway:alpine-trunk ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_alpine_pgsql_local.yaml b/docker-compose_v2_alpine_pgsql_local.yaml deleted file mode 100644 index 982704230..000000000 --- a/docker-compose_v2_alpine_pgsql_local.yaml +++ /dev/null @@ -1,312 +0,0 @@ -version: '2' -services: - zabbix-server: - build: ./server-pgsql/alpine - image: zabbix-server-pgsql:alpine-local - 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-alpine-pgsql - - zabbix-server-pgsql-alpine - 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: "alpine" - - zabbix-proxy-sqlite3: - build: ./proxy-sqlite3/alpine - image: zabbix-proxy-sqlite3:alpine-local - 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-alpine-sqlite3 - - zabbix-proxy-sqlite3-alpine - 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: "alpine" - - zabbix-proxy-mysql: - build: ./proxy-mysql/alpine - image: zabbix-proxy-mysql:alpine-local - 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-alpine-mysql - - zabbix-proxy-mysql-alpine - 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: "alpine" - - - zabbix-web-apache-pgsql: - build: ./web-apache-pgsql/alpine - image: zabbix-web-apache-pgsql:alpine-local - 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-alpine-pgsql - - zabbix-web-apache-pgsql-alpine - 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: "alpine" - - zabbix-web-nginx-pgsql: - build: ./web-nginx-pgsql/alpine - image: zabbix-web-nginx-pgsql:alpine-local - 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-alpine-pgsql - - zabbix-web-nginx-pgsql-alpine - 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: "alpine" - - zabbix-agent: - build: ./agent/alpine - image: zabbix-agent:alpine-local - 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-alpine - labels: - com.zabbix.description: "Zabbix agent" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-agentd" - com.zabbix.os: "alpine" - - zabbix-java-gateway: - build: ./java-gateway/alpine - image: zabbix-java-gateway:alpine-local - ports: - - "10052:10052" - env_file: - - .env_java - user: root - networks: - zbx_net: - aliases: - - zabbix-java-gateway - - zabbix-java-gateway-alpine - labels: - com.zabbix.description: "Zabbix Java Gateway" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "java-gateway" - com.zabbix.os: "alpine" - - zabbix-snmptraps: - build: ./snmptraps/ubuntu - image: zabbix-snmptraps:ubuntu-local - 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 - 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_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_trunk.yaml similarity index 94% rename from docker-compose_v2_alpine_pgsql_latest.yaml rename to docker-compose_v2_alpine_pgsql_trunk.yaml index f2bd0f39d..1770dd113 100644 --- a/docker-compose_v2_alpine_pgsql_latest.yaml +++ b/docker-compose_v2_alpine_pgsql_trunk.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-latest + image: zabbix/zabbix-server-pgsql:alpine-trunk ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-trunk ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-latest + image: zabbix/zabbix-proxy-mysql:alpine-trunk ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:alpine-latest + image: zabbix/zabbix-web-apache-pgsql:alpine-trunk ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:alpine-latest + image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-latest + image: zabbix/zabbix-agent:alpine-trunk ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-latest + image: zabbix/zabbix-java-gateway:alpine-trunk ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_mysql_local.yaml b/docker-compose_v2_ubuntu_mysql_local.yaml deleted file mode 100644 index 00a56951e..000000000 --- a/docker-compose_v2_ubuntu_mysql_local.yaml +++ /dev/null @@ -1,293 +0,0 @@ -version: '2' -services: - zabbix-server: - build: ./server-mysql/ubuntu - image: zabbix-server-mysql:ubuntu-local - 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 - - zabbix-snmptraps:zabbix-snmptraps - 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-ubuntu-mysql - - zabbix-server-mysql-ubuntu - 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: "ubuntu" - - zabbix-proxy-sqlite3: - build: ./proxy-sqlite3/ubuntu - image: zabbix-proxy-sqlite3:ubuntu-local - 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-ubuntu-sqlite3 - - zabbix-proxy-sqlite3-ubuntu - 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: "ubuntu" - - zabbix-proxy-mysql: - build: ./proxy-mysql/ubuntu - image: zabbix-proxy-mysql:ubuntu-local - 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-ubuntu-mysql - - zabbix-proxy-mysql-ubuntu - 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: "ubuntu" - - zabbix-web-apache-mysql: - build: ./web-apache-mysql/ubuntu - image: zabbix-web-apache-mysql:ubuntu-local - 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-ubuntu-mysql - - zabbix-web-apache-mysql-ubuntu - 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: "ubuntu" - - zabbix-web-nginx-mysql: - build: ./web-nginx-mysql/ubuntu - image: zabbix-web-nginx-mysql:ubuntu-local - 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-ubuntu-mysql - - zabbix-web-nginx-mysql-ubuntu - 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: "ubuntu" - - zabbix-agent: - build: ./agent/ubuntu - image: zabbix-agent:ubuntu-local - 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-ubuntu - labels: - com.zabbix.description: "Zabbix agent" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-agentd" - com.zabbix.os: "ubuntu" - - zabbix-java-gateway: - build: ./java-gateway/ubuntu - image: zabbix-java-gateway:ubuntu-local - ports: - - "10052:10052" - env_file: - - .env_java - user: root - networks: - zbx_net: - aliases: - - zabbix-java-gateway - - zabbix-java-gateway-ubuntu - labels: - com.zabbix.description: "Zabbix Java Gateway" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "java-gateway" - com.zabbix.os: "ubuntu" - - zabbix-snmptraps: - build: ./snmptraps/ubuntu - image: zabbix-snmptraps:ubuntu-local - 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 - 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_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_trunk.yaml similarity index 94% rename from docker-compose_v2_ubuntu_mysql_latest.yaml rename to docker-compose_v2_ubuntu_mysql_trunk.yaml index b82b5c318..da8806559 100644 --- a/docker-compose_v2_ubuntu_mysql_latest.yaml +++ b/docker-compose_v2_ubuntu_mysql_trunk.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:ubuntu-latest + image: zabbix/zabbix-server-mysql:ubuntu-trunk ports: - "10051:10051" volumes: @@ -18,7 +18,6 @@ services: links: - mysql-server:mysql-server - zabbix-java-gateway:zabbix-java-gateway - - zabbix-snmptraps:zabbix-snmptraps ulimits: nproc: 65535 nofile: @@ -44,7 +43,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk ports: - "10061:10051" volumes: @@ -84,7 +83,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-latest + image: zabbix/zabbix-proxy-mysql:ubuntu-trunk ports: - "10071:10051" volumes: @@ -125,7 +124,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:ubuntu-latest + image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk ports: - "80:80" - "443:443" @@ -156,7 +155,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest + image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk ports: - "8081:80" - "8443:443" @@ -187,7 +186,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-latest + image: zabbix/zabbix-agent:ubuntu-trunk ports: - "10050:10050" volumes: @@ -197,6 +196,8 @@ services: - ./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 + volumes_from: + - zabbix-snmptraps:ro links: - zabbix-server:zabbix-server env_file: @@ -217,7 +218,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-latest + image: zabbix/zabbix-java-gateway:ubuntu-trunk ports: - "10052:10052" env_file: @@ -235,7 +236,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_pgsql_local.yaml b/docker-compose_v2_ubuntu_pgsql_local.yaml deleted file mode 100644 index bd68a59b0..000000000 --- a/docker-compose_v2_ubuntu_pgsql_local.yaml +++ /dev/null @@ -1,311 +0,0 @@ -version: '2' -services: - zabbix-server: - build: ./server-pgsql/ubuntu - image: zabbix-server-pgsql:ubuntu-local - 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-ubuntu-pgsql - - zabbix-server-pgsql-ubuntu - 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: "ubuntu" - - zabbix-proxy-sqlite3: - build: ./proxy-sqlite3/ubuntu - image: zabbix-proxy-sqlite3:ubuntu-local - 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-ubuntu-sqlite3 - - zabbix-proxy-sqlite3-ubuntu - 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: "ubuntu" - - zabbix-proxy-mysql: - build: ./proxy-mysql/ubuntu - image: zabbix-proxy-mysql:ubuntu-local - 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-ubuntu-mysql - - zabbix-proxy-mysql-ubuntu - 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: "ubuntu" - - zabbix-web-apache-pgsql: - build: ./web-apache-pgsql/ubuntu - image: zabbix-web-apache-pgsql:ubuntu-local - 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-ubuntu-pgsql - - zabbix-web-apache-pgsql-ubuntu - 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: "ubuntu" - - zabbix-web-nginx-pgsql: - build: ./web-nginx-pgsql/ubuntu - image: zabbix-web-nginx-pgsql:ubuntu-local - 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-ubuntu-pgsql - - zabbix-web-nginx-pgsql-ubuntu - 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: "ubuntu" - - zabbix-agent: - build: ./agent/ubuntu - image: zabbix-agent:ubuntu-local - 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-ubuntu - labels: - com.zabbix.description: "Zabbix agent" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "zabbix-agentd" - com.zabbix.os: "ubuntu" - - zabbix-java-gateway: - build: ./java-gateway/ubuntu - image: zabbix-java-gateway:ubuntu-local - ports: - - "10052:10052" - env_file: - - .env_java - user: root - networks: - zbx_net: - aliases: - - zabbix-java-gateway - - zabbix-java-gateway-ubuntu - labels: - com.zabbix.description: "Zabbix Java Gateway" - com.zabbix.company: "Zabbix SIA" - com.zabbix.component: "java-gateway" - com.zabbix.os: "ubuntu" - - zabbix-snmptraps: - build: ./snmptraps/ubuntu - image: zabbix-snmptraps:ubuntu-local - 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 - 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_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_trunk.yaml similarity index 94% rename from docker-compose_v2_ubuntu_pgsql_latest.yaml rename to docker-compose_v2_ubuntu_pgsql_trunk.yaml index dcbbd313b..9a3bada31 100644 --- a/docker-compose_v2_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v2_ubuntu_pgsql_trunk.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:ubuntu-latest + image: zabbix/zabbix-server-pgsql:ubuntu-trunk ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-latest + image: zabbix/zabbix-proxy-mysql:ubuntu-trunk ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest + image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk ports: - "80:80" - "443:443" @@ -154,8 +154,9 @@ services: com.zabbix.dbtype: "pgsql" com.zabbix.os: "ubuntu" + zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest + image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk ports: - "8081:80" - "8443:443" @@ -186,7 +187,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-latest + image: zabbix/zabbix-agent:ubuntu-trunk ports: - "10050:10050" volumes: @@ -216,7 +217,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-latest + image: zabbix/zabbix-java-gateway:ubuntu-trunk ports: - "10052:10052" env_file: @@ -234,7 +235,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 0dfec7fab..8289d9932 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -21,8 +21,8 @@ RUN addgroup zabbix && \ openjdk8-jre-base && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 18aa99033..0274e238b 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -27,8 +27,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 716f96ff1..e4ba6f56b 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -43,8 +43,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index a0f75e2c5..40c898005 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-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}.0 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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index a6337f8c1..587573e87 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -39,8 +39,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index b3f4d0820..695ac49fc 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -46,8 +46,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}.0 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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index e3391edaf..087678b0b 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 919b1c871..6e381a9c5 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -49,8 +49,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}.0 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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index f7a7fa432..a6aedb181 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index f55c39244..fa1be47c0 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -49,8 +49,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}.0 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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 4694b98a3..1ba731a7a 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -37,8 +37,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}.0 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 ae3e88ee7..338f18a2b 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -36,8 +36,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 3a2610440..f923e0292 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -36,8 +36,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}.0 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 4b887f744..8f64d12ff 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -36,8 +36,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master -ARG ZBX_VERSION=${MAJOR_VERSION} +ARG MAJOR_VERSION=3.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.0 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 2b52184cb..8847a8f8d 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -36,8 +36,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}.0 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 f9ceb4ea3..c0e90daed 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -43,8 +43,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO chown --quiet -R www-data:www-data /var/lib/php5 && \ 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}.0 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 f22ca6a79..488e175e2 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -35,8 +35,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}.0 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 49ecfb9fa..434a981bb 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -43,8 +43,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO chown --quiet -R www-data:www-data /var/lib/php5 && \ 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}.0 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From d36f651731dc84ca51fb4db9e7912bd83db16ffc Mon Sep 17 00:00:00 2001 From: dotneft Date: Fri, 28 Oct 2016 07:10:53 -0700 Subject: [PATCH 02/20] Trunk update --- agent/alpine/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 397776195..dd358974d 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -26,8 +26,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apk update && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 1ea19d9da..59c7318ba 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -31,8 +31,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 8289d9932..58fd63aab 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,8 +22,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 0274e238b..a0e422fc4 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,8 +28,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index e4ba6f56b..d6eff786f 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 40c898005..efde43c37 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -49,8 +49,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 587573e87..b91e19d54 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -40,8 +40,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 695ac49fc..0d7afd761 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -47,8 +47,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 087678b0b..b41819045 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -45,8 +45,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 6e381a9c5..e72798f12 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -50,8 +50,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index a6aedb181..ea78ad5a3 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -45,8 +45,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index fa1be47c0..4d7947849 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -50,8 +50,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 1ba731a7a..4438392e2 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,8 +38,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 338f18a2b..8855c99fe 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,8 +37,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index f923e0292..d99aa9a2c 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,8 +37,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 8f64d12ff..c5cbfbc48 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,8 +37,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 8847a8f8d..446fe441e 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,8 +37,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index c0e90daed..e0c96af08 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -44,8 +44,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 488e175e2..288cca860 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,8 +36,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 434a981bb..efade21f4 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -44,8 +44,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_VERSION=${MAJOR_VERSION} +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config From 84e4de1cb117baa92240f4fd6012a3fe97c50084 Mon Sep 17 00:00:00 2001 From: dotneft Date: Sat, 11 Mar 2017 14:51:18 -0800 Subject: [PATCH 03/20] Added libevent for trunk --- proxy-mysql/alpine/Dockerfile | 2 ++ proxy-mysql/ubuntu/Dockerfile | 3 +++ proxy-sqlite3/alpine/Dockerfile | 2 ++ proxy-sqlite3/ubuntu/Dockerfile | 3 +++ server-mysql/alpine/Dockerfile | 2 ++ server-mysql/ubuntu/Dockerfile | 3 +++ server-pgsql/alpine/Dockerfile | 2 ++ server-pgsql/ubuntu/Dockerfile | 3 +++ 8 files changed, 20 insertions(+) diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index b84a74363..ceb4944a9 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -40,6 +40,7 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ libssh2 && \ rm -rf /var/cache/apk/* @@ -61,6 +62,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index efde43c37..982e9eb54 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -43,6 +43,7 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ fping \ + libevent-2.0 \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -69,6 +70,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -113,6 +115,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ gcc \ libc6-dev \ make \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index c7e6d21c8..f8e8742c1 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ libssh2 && \ rm -rf /var/cache/apk/* @@ -57,6 +58,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 0d7afd761..6ebb16349 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -41,6 +41,7 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ fping \ + libevent-2.0-5 \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -67,6 +68,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -114,6 +116,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index b399bd9ed..4a816b9e0 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ libssh2 && \ rm -rf /var/cache/apk/* @@ -62,6 +63,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index e72798f12..a0161f8ea 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -43,6 +43,7 @@ RUN locale-gen $LC_ALL && \ libssh2-1 \ libssl1.0.0 \ libxml2 \ + libevent-2.0 \ fping \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -70,6 +71,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -120,6 +122,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 3f172ff5f..14c1ea970 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ libssh2 && \ rm -rf /var/cache/apk/* @@ -62,6 +63,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 4d7947849..4aa75bff8 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -43,6 +43,7 @@ RUN locale-gen $LC_ALL && \ libssh2-1 \ libssl1.0.0 \ libxml2 \ + libevent-2.0 \ fping \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -70,6 +71,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -120,6 +122,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* From f003ebaa29055b9898ec6d921a171a5bb407332f Mon Sep 17 00:00:00 2001 From: dotneft Date: Wed, 10 May 2017 13:27:50 -0700 Subject: [PATCH 04/20] Added PCRE library --- agent/alpine/Dockerfile | 2 ++ agent/ubuntu/Dockerfile | 3 +++ java-gateway/alpine/Dockerfile | 1 + java-gateway/ubuntu/Dockerfile | 2 ++ proxy-mysql/alpine/Dockerfile | 2 ++ proxy-mysql/ubuntu/Dockerfile | 3 +++ proxy-sqlite3/alpine/Dockerfile | 2 ++ proxy-sqlite3/ubuntu/Dockerfile | 3 +++ server-mysql/alpine/Dockerfile | 2 ++ server-mysql/ubuntu/Dockerfile | 3 +++ server-pgsql/alpine/Dockerfile | 2 ++ server-pgsql/ubuntu/Dockerfile | 3 +++ 12 files changed, 28 insertions(+) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index fa724fc26..989a47efc 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -22,6 +22,7 @@ RUN addgroup zabbix && \ supervisor \ bash \ coreutils \ + pcre \ libssl1.0 && \ rm -rf /var/cache/apk/* @@ -36,6 +37,7 @@ RUN apk update && \ automake \ autoconf \ openssl-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index b8e9a6cf2..c5ceeee3f 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -25,6 +25,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ supervisor \ + libpcre3 \ libssl1.0.0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -43,6 +44,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ libssl-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -73,6 +75,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ libssl-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index dfe37f69d..271c2c2bc 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -32,6 +32,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ autoconf \ openjdk8 \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 0484670ce..ef6c61c88 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -40,6 +40,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ openjdk-7-jdk \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ @@ -68,6 +69,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ openjdk-7-jdk \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 2cb361ef6..dd174e681 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup zabbix && \ libcurl \ openipmi-libs \ libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -63,6 +64,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openldap-dev \ curl-dev \ libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index f4c05e7f2..72d1c19ff 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -44,6 +44,7 @@ RUN locale-gen $LC_ALL && \ libxml2 \ fping \ libevent-2.0 \ + libpcre3 \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -71,6 +72,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -117,6 +119,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ gcc \ libc6-dev \ make \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index acbce7042..a3003e144 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -37,6 +37,7 @@ RUN addgroup zabbix && \ libcurl \ openipmi-libs \ libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -59,6 +60,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openldap-dev \ curl-dev \ libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 227bafc9b..13edbb6d1 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -42,6 +42,7 @@ RUN locale-gen $LC_ALL && \ libxml2 \ fping \ libevent-2.0-5 \ + libpcre3 \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -69,6 +70,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -118,6 +120,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 7c50952c0..879ae9193 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -42,6 +42,7 @@ RUN addgroup zabbix && \ libcurl \ openipmi-libs \ libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -64,6 +65,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openldap-dev \ curl-dev \ libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index c5b33ee8f..185e67b9f 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -44,6 +44,7 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ libevent-2.0 \ + libpcre3 \ fping \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -72,6 +73,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -124,6 +126,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 6bfc950dd..91db6e596 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -42,6 +42,7 @@ RUN addgroup zabbix && \ libcurl \ openipmi-libs \ libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -64,6 +65,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openldap-dev \ curl-dev \ libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 0da2bb9bb..a6006efb9 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -44,6 +44,7 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ libevent-2.0 \ + libpcre3 \ fping \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -72,6 +73,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -124,6 +126,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ unixodbc-dev \ libxml2-dev \ libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* From 37624313416da92af7a9a359e238b8bbb826af4c Mon Sep 17 00:00:00 2001 From: dotneft Date: Tue, 22 Aug 2017 02:35:20 -0700 Subject: [PATCH 05/20] Zabbix 3.4 release --- ...docker-compose_v2_alpine_mysql_latest.yaml | 16 +- docker-compose_v2_alpine_mysql_local.yaml | 292 ++++++++++++++++ ...docker-compose_v2_alpine_pgsql_latest.yaml | 16 +- docker-compose_v2_alpine_pgsql_local.yaml | 312 ++++++++++++++++++ ...docker-compose_v2_ubuntu_mysql_latest.yaml | 19 +- docker-compose_v2_ubuntu_mysql_local.yaml | 293 ++++++++++++++++ ...docker-compose_v2_ubuntu_pgsql_latest.yaml | 17 +- docker-compose_v2_ubuntu_pgsql_local.yaml | 311 +++++++++++++++++ 8 files changed, 1241 insertions(+), 35 deletions(-) rename docker-compose_v2_alpine_mysql_trunk.yaml => docker-compose_v2_alpine_mysql_latest.yaml (94%) create mode 100644 docker-compose_v2_alpine_mysql_local.yaml rename docker-compose_v2_alpine_pgsql_trunk.yaml => docker-compose_v2_alpine_pgsql_latest.yaml (94%) create mode 100644 docker-compose_v2_alpine_pgsql_local.yaml rename docker-compose_v2_ubuntu_mysql_trunk.yaml => docker-compose_v2_ubuntu_mysql_latest.yaml (93%) create mode 100644 docker-compose_v2_ubuntu_mysql_local.yaml rename docker-compose_v2_ubuntu_pgsql_trunk.yaml => docker-compose_v2_ubuntu_pgsql_latest.yaml (94%) create mode 100644 docker-compose_v2_ubuntu_pgsql_local.yaml diff --git a/docker-compose_v2_alpine_mysql_trunk.yaml b/docker-compose_v2_alpine_mysql_latest.yaml similarity index 94% rename from docker-compose_v2_alpine_mysql_trunk.yaml rename to docker-compose_v2_alpine_mysql_latest.yaml index f9fc22b4b..283b1151e 100644 --- a/docker-compose_v2_alpine_mysql_trunk.yaml +++ b/docker-compose_v2_alpine_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:alpine-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_alpine_mysql_local.yaml b/docker-compose_v2_alpine_mysql_local.yaml new file mode 100644 index 000000000..d5e25a8ac --- /dev/null +++ b/docker-compose_v2_alpine_mysql_local.yaml @@ -0,0 +1,292 @@ +version: '2' +services: + zabbix-server: + build: ./server-mysql/alpine + image: zabbix-server-mysql:alpine-local + 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-alpine-mysql + - zabbix-server-mysql-alpine + 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: "alpine" + + zabbix-proxy-sqlite3: + build: ./proxy-sqlite3/alpine + image: zabbix-proxy-sqlite3:alpine-local + 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-alpine-sqlite3 + - zabbix-proxy-sqlite3-alpine + 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: "alpine" + + zabbix-proxy-mysql: + build: ./proxy-mysql/alpine + image: zabbix-proxy-mysql:alpine-local + 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-alpine-mysql + - zabbix-proxy-mysql-alpine + 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: "alpine" + + zabbix-web-apache-mysql: + build: ./web-apache-mysql/alpine + image: zabbix-web-apache-mysql:alpine-local + 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-alpine-mysql + - zabbix-web-apache-mysql-alpine + 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: "alpine" + + zabbix-web-nginx-mysql: + build: ./web-nginx-mysql/alpine + image: zabbix-web-nginx-mysql:alpine-local + 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-alpine-mysql + - zabbix-web-nginx-mysql-alpine + 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: "alpine" + + zabbix-agent: + build: ./agent/alpine + image: zabbix-agent:alpine-local + 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-alpine + labels: + com.zabbix.description: "Zabbix agent" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-agentd" + com.zabbix.os: "alpine" + + zabbix-java-gateway: + build: ./java-gateway/alpine + image: zabbix-java-gateway:alpine-local + ports: + - "10052:10052" + env_file: + - .env_java + user: root + networks: + zbx_net: + aliases: + - zabbix-java-gateway + - zabbix-java-gateway-alpine + labels: + com.zabbix.description: "Zabbix Java Gateway" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "java-gateway" + com.zabbix.os: "alpine" + + zabbix-snmptraps: + build: ./snmptraps/ubuntu + image: zabbix-snmptraps:ubuntu-local + 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 + 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_alpine_pgsql_trunk.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml similarity index 94% rename from docker-compose_v2_alpine_pgsql_trunk.yaml rename to docker-compose_v2_alpine_pgsql_latest.yaml index 1770dd113..12dc12a72 100644 --- a/docker-compose_v2_alpine_pgsql_trunk.yaml +++ b/docker-compose_v2_alpine_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-trunk + 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-trunk + 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-trunk + 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-pgsql: - image: zabbix/zabbix-web-apache-pgsql:alpine-trunk + image: zabbix/zabbix-web-apache-pgsql:alpine-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk + 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-trunk + 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-trunk + 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-trunk + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_alpine_pgsql_local.yaml b/docker-compose_v2_alpine_pgsql_local.yaml new file mode 100644 index 000000000..982704230 --- /dev/null +++ b/docker-compose_v2_alpine_pgsql_local.yaml @@ -0,0 +1,312 @@ +version: '2' +services: + zabbix-server: + build: ./server-pgsql/alpine + image: zabbix-server-pgsql:alpine-local + 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-alpine-pgsql + - zabbix-server-pgsql-alpine + 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: "alpine" + + zabbix-proxy-sqlite3: + build: ./proxy-sqlite3/alpine + image: zabbix-proxy-sqlite3:alpine-local + 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-alpine-sqlite3 + - zabbix-proxy-sqlite3-alpine + 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: "alpine" + + zabbix-proxy-mysql: + build: ./proxy-mysql/alpine + image: zabbix-proxy-mysql:alpine-local + 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-alpine-mysql + - zabbix-proxy-mysql-alpine + 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: "alpine" + + + zabbix-web-apache-pgsql: + build: ./web-apache-pgsql/alpine + image: zabbix-web-apache-pgsql:alpine-local + 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-alpine-pgsql + - zabbix-web-apache-pgsql-alpine + 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: "alpine" + + zabbix-web-nginx-pgsql: + build: ./web-nginx-pgsql/alpine + image: zabbix-web-nginx-pgsql:alpine-local + 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-alpine-pgsql + - zabbix-web-nginx-pgsql-alpine + 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: "alpine" + + zabbix-agent: + build: ./agent/alpine + image: zabbix-agent:alpine-local + 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-alpine + labels: + com.zabbix.description: "Zabbix agent" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-agentd" + com.zabbix.os: "alpine" + + zabbix-java-gateway: + build: ./java-gateway/alpine + image: zabbix-java-gateway:alpine-local + ports: + - "10052:10052" + env_file: + - .env_java + user: root + networks: + zbx_net: + aliases: + - zabbix-java-gateway + - zabbix-java-gateway-alpine + labels: + com.zabbix.description: "Zabbix Java Gateway" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "java-gateway" + com.zabbix.os: "alpine" + + zabbix-snmptraps: + build: ./snmptraps/ubuntu + image: zabbix-snmptraps:ubuntu-local + 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 + 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_trunk.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml similarity index 93% rename from docker-compose_v2_ubuntu_mysql_trunk.yaml rename to docker-compose_v2_ubuntu_mysql_latest.yaml index da8806559..ff89b389f 100644 --- a/docker-compose_v2_ubuntu_mysql_trunk.yaml +++ b/docker-compose_v2_ubuntu_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:ubuntu-trunk + image: zabbix/zabbix-server-mysql:ubuntu-3.4-latest ports: - "10051:10051" volumes: @@ -18,6 +18,7 @@ services: links: - mysql-server:mysql-server - zabbix-java-gateway:zabbix-java-gateway + - zabbix-snmptraps:zabbix-snmptraps ulimits: nproc: 65535 nofile: @@ -43,7 +44,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + image: zabbix/zabbix-proxy-sqlite3:ubuntu-3.4-latest ports: - "10061:10051" volumes: @@ -83,7 +84,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + image: zabbix/zabbix-proxy-mysql:ubuntu-3.4-latest ports: - "10071:10051" volumes: @@ -124,7 +125,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk + image: zabbix/zabbix-web-apache-mysql:ubuntu-3.4-latest ports: - "80:80" - "443:443" @@ -155,7 +156,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk + image: zabbix/zabbix-web-nginx-mysql:ubuntu-3.4-latest ports: - "8081:80" - "8443:443" @@ -186,7 +187,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-trunk + image: zabbix/zabbix-agent:ubuntu-3.4-latest ports: - "10050:10050" volumes: @@ -196,8 +197,6 @@ services: - ./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 - volumes_from: - - zabbix-snmptraps:ro links: - zabbix-server:zabbix-server env_file: @@ -218,7 +217,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-trunk + image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest ports: - "10052:10052" env_file: @@ -236,7 +235,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_mysql_local.yaml b/docker-compose_v2_ubuntu_mysql_local.yaml new file mode 100644 index 000000000..00a56951e --- /dev/null +++ b/docker-compose_v2_ubuntu_mysql_local.yaml @@ -0,0 +1,293 @@ +version: '2' +services: + zabbix-server: + build: ./server-mysql/ubuntu + image: zabbix-server-mysql:ubuntu-local + 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 + - zabbix-snmptraps:zabbix-snmptraps + 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-ubuntu-mysql + - zabbix-server-mysql-ubuntu + 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: "ubuntu" + + zabbix-proxy-sqlite3: + build: ./proxy-sqlite3/ubuntu + image: zabbix-proxy-sqlite3:ubuntu-local + 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-ubuntu-sqlite3 + - zabbix-proxy-sqlite3-ubuntu + 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: "ubuntu" + + zabbix-proxy-mysql: + build: ./proxy-mysql/ubuntu + image: zabbix-proxy-mysql:ubuntu-local + 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-ubuntu-mysql + - zabbix-proxy-mysql-ubuntu + 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: "ubuntu" + + zabbix-web-apache-mysql: + build: ./web-apache-mysql/ubuntu + image: zabbix-web-apache-mysql:ubuntu-local + 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-ubuntu-mysql + - zabbix-web-apache-mysql-ubuntu + 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: "ubuntu" + + zabbix-web-nginx-mysql: + build: ./web-nginx-mysql/ubuntu + image: zabbix-web-nginx-mysql:ubuntu-local + 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-ubuntu-mysql + - zabbix-web-nginx-mysql-ubuntu + 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: "ubuntu" + + zabbix-agent: + build: ./agent/ubuntu + image: zabbix-agent:ubuntu-local + 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-ubuntu + labels: + com.zabbix.description: "Zabbix agent" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-agentd" + com.zabbix.os: "ubuntu" + + zabbix-java-gateway: + build: ./java-gateway/ubuntu + image: zabbix-java-gateway:ubuntu-local + ports: + - "10052:10052" + env_file: + - .env_java + user: root + networks: + zbx_net: + aliases: + - zabbix-java-gateway + - zabbix-java-gateway-ubuntu + labels: + com.zabbix.description: "Zabbix Java Gateway" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "java-gateway" + com.zabbix.os: "ubuntu" + + zabbix-snmptraps: + build: ./snmptraps/ubuntu + image: zabbix-snmptraps:ubuntu-local + 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 + 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_ubuntu_pgsql_trunk.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml similarity index 94% rename from docker-compose_v2_ubuntu_pgsql_trunk.yaml rename to docker-compose_v2_ubuntu_pgsql_latest.yaml index 9a3bada31..8f8597cf2 100644 --- a/docker-compose_v2_ubuntu_pgsql_trunk.yaml +++ b/docker-compose_v2_ubuntu_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:ubuntu-trunk + 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-trunk + 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-trunk + 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-trunk + image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest ports: - "80:80" - "443:443" @@ -154,9 +154,8 @@ services: com.zabbix.dbtype: "pgsql" com.zabbix.os: "ubuntu" - zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk + image: zabbix/zabbix-web-nginx-pgsql:ubuntu-3.4-latest ports: - "8081:80" - "8443:443" @@ -187,7 +186,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-trunk + image: zabbix/zabbix-agent:ubuntu-3.4-latest ports: - "10050:10050" volumes: @@ -217,7 +216,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-trunk + image: zabbix/zabbix-java-gateway:ubuntu-3.4-latest ports: - "10052:10052" env_file: @@ -235,7 +234,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_pgsql_local.yaml b/docker-compose_v2_ubuntu_pgsql_local.yaml new file mode 100644 index 000000000..bd68a59b0 --- /dev/null +++ b/docker-compose_v2_ubuntu_pgsql_local.yaml @@ -0,0 +1,311 @@ +version: '2' +services: + zabbix-server: + build: ./server-pgsql/ubuntu + image: zabbix-server-pgsql:ubuntu-local + 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-ubuntu-pgsql + - zabbix-server-pgsql-ubuntu + 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: "ubuntu" + + zabbix-proxy-sqlite3: + build: ./proxy-sqlite3/ubuntu + image: zabbix-proxy-sqlite3:ubuntu-local + 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-ubuntu-sqlite3 + - zabbix-proxy-sqlite3-ubuntu + 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: "ubuntu" + + zabbix-proxy-mysql: + build: ./proxy-mysql/ubuntu + image: zabbix-proxy-mysql:ubuntu-local + 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-ubuntu-mysql + - zabbix-proxy-mysql-ubuntu + 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: "ubuntu" + + zabbix-web-apache-pgsql: + build: ./web-apache-pgsql/ubuntu + image: zabbix-web-apache-pgsql:ubuntu-local + 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-ubuntu-pgsql + - zabbix-web-apache-pgsql-ubuntu + 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: "ubuntu" + + zabbix-web-nginx-pgsql: + build: ./web-nginx-pgsql/ubuntu + image: zabbix-web-nginx-pgsql:ubuntu-local + 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-ubuntu-pgsql + - zabbix-web-nginx-pgsql-ubuntu + 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: "ubuntu" + + zabbix-agent: + build: ./agent/ubuntu + image: zabbix-agent:ubuntu-local + 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-ubuntu + labels: + com.zabbix.description: "Zabbix agent" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "zabbix-agentd" + com.zabbix.os: "ubuntu" + + zabbix-java-gateway: + build: ./java-gateway/ubuntu + image: zabbix-java-gateway:ubuntu-local + ports: + - "10052:10052" + env_file: + - .env_java + user: root + networks: + zbx_net: + aliases: + - zabbix-java-gateway + - zabbix-java-gateway-ubuntu + labels: + com.zabbix.description: "Zabbix Java Gateway" + com.zabbix.company: "Zabbix SIA" + com.zabbix.component: "java-gateway" + com.zabbix.os: "ubuntu" + + zabbix-snmptraps: + build: ./snmptraps/ubuntu + image: zabbix-snmptraps:ubuntu-local + 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 + 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 a206680ea3e0a4d12b31cc7bb5f5785da82b3c18 Mon Sep 17 00:00:00 2001 From: dotneft Date: Tue, 22 Aug 2017 02:42:14 -0700 Subject: [PATCH 06/20] Zabbix 3.4.0 release --- agent/alpine/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 3ec6656d5..c92fc0d8f 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,8 +28,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apk update && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index c5ceeee3f..cdf89f33d 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,8 +32,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 271c2c2bc..bda75328b 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,8 +22,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index ef6c61c88..88e641ee4 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,8 +28,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index b27a7fc89..b66f376dd 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,8 +47,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 72d1c19ff..79799d10b 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -51,8 +51,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 9e0b0b4a9..6d269a39e 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,8 +43,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 13edbb6d1..03e1996c5 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,8 +49,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 8baa0332e..99f79050d 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,8 +48,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 185e67b9f..c158abe1a 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,8 +52,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 09fc66a0e..e83b934a5 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,8 +48,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index a6006efb9..1094b5c8e 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,8 +52,8 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 6adec502f..92ec794bf 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,8 +38,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 49c47564c..ecb141b3f 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,8 +37,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index a02665377..9363a2772 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,8 +37,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 88980be89..b1a8b07ec 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,8 +37,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 2793998c9..d776dffcd 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,8 +37,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 09906366c..bb58b5866 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,8 +45,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 1afdc35df..8422837c5 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,8 +36,8 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index ec349b77f..ddb8393a6 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,8 +45,8 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config From 3e03235c40cab6fdeabc3b3a439e081c29d48efa Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Aug 2017 10:48:49 +0300 Subject: [PATCH 07/20] Zabbix 3.4.1 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index c92fc0d8f..c05ee8644 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 cdf89f33d..713e9a779 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index bda75328b..c678201d1 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 88e641ee4..883eede06 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index b66f376dd..cf28157d7 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 79799d10b..e105c5f8b 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -51,7 +51,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 6d269a39e..bbcdf4e2f 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 03e1996c5..032ee95fe 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 99f79050d..656142f29 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index c158abe1a..08f16a629 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index e83b934a5..158294c86 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 1094b5c8e..2bf539fbe 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 92ec794bf..c550ecfc5 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 ecb141b3f..311d37655 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 9363a2772..73bd2f298 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 b1a8b07ec..fe28bd399 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 d776dffcd..1111039cb 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 bb58b5866..8a339517c 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 8422837c5..9a2a833c5 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 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 ddb8393a6..9e56f8b2c 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.0 +ARG ZBX_VERSION=${MAJOR_VERSION}.1 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From a2ab1a9bfda2c051e74e7ba0de449857b78650c3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 12 Oct 2017 20:33:53 +0300 Subject: [PATCH 08/20] Zabbix 3.4.2 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index c05ee8644..a6b47f091 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 713e9a779..3d3ab674f 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index c678201d1..d7a5b77bc 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 883eede06..8b97def5e 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index cf28157d7..bda42fd5d 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index e105c5f8b..557da78c6 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -51,7 +51,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index bbcdf4e2f..9ef510f9a 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 032ee95fe..2db7f196d 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 656142f29..267f1e382 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 08f16a629..e81595364 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 158294c86..1a1408d15 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 2bf539fbe..0152d5642 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index c550ecfc5..7684a625f 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 311d37655..268e97211 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 73bd2f298..9db490dbd 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 fe28bd399..38cee9585 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 1111039cb..4ad904a03 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 8a339517c..b9ecad234 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 9a2a833c5..e9642d28f 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 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 9e56f8b2c..83419c955 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.1 +ARG ZBX_VERSION=${MAJOR_VERSION}.2 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From 3b989be95f16683aabb6a2922237e5478c742d15 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 21 Oct 2017 17:34:03 +0300 Subject: [PATCH 09/20] Zabbix 3.4.3 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index e702c9129..9290b0d08 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 3aaa05fc0..865dc088d 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index d7a5b77bc..5f4ab863b 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 8b97def5e..dcff19dc3 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 93cd7aea2..d4c529d90 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index feca5dea8..485b64c3c 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -51,7 +51,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index a51730c4c..9ac951a6d 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index b9bed6602..0f1e3a41d 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 8ef31d5b5..8e5b68c77 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 4d4818114..f3e1f910e 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index d73215be5..a6b313f7f 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 1b27d2513..f2bfb2a36 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 7684a625f..14c7bb66a 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 268e97211..0babdf52b 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 9db490dbd..8b0313181 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 38cee9585..03229f084 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 4ad904a03..a9a4d8303 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 b9ecad234..2e3b8744c 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 e9642d28f..7b3cb8360 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 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 83419c955..036f4ed48 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.2 +ARG ZBX_VERSION=${MAJOR_VERSION}.3 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From 38a27687c520caf77fca697a3a4f2f6e9f059b07 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 21 Oct 2017 18:18:18 +0300 Subject: [PATCH 10/20] Fixed version for zabbix-web-apache-pgsql image in docker-compose reciept --- docker-compose_v2_ubuntu_pgsql_latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index 4d009f338..a4dba60b2 100644 --- a/docker-compose_v2_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v2_ubuntu_pgsql_latest.yaml @@ -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" From 4f481f811e971e5dcd224ec7299b6275f7899dcb Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Oct 2017 18:51:39 +0300 Subject: [PATCH 11/20] Fixed MySQL user creation --- agent/alpine/run_zabbix_component.sh | 2 +- agent/ubuntu/run_zabbix_component.sh | 2 +- java-gateway/alpine/run_zabbix_component.sh | 2 +- java-gateway/ubuntu/run_zabbix_component.sh | 2 +- proxy-mysql/alpine/run_zabbix_component.sh | 2 +- proxy-mysql/ubuntu/run_zabbix_component.sh | 2 +- proxy-sqlite3/alpine/run_zabbix_component.sh | 2 +- proxy-sqlite3/ubuntu/run_zabbix_component.sh | 2 +- server-mysql/alpine/run_zabbix_component.sh | 2 +- server-mysql/ubuntu/run_zabbix_component.sh | 2 +- server-pgsql/alpine/run_zabbix_component.sh | 2 +- server-pgsql/ubuntu/run_zabbix_component.sh | 2 +- web-apache-mysql/alpine/run_zabbix_component.sh | 2 +- web-apache-mysql/ubuntu/run_zabbix_component.sh | 2 +- web-apache-pgsql/alpine/run_zabbix_component.sh | 2 +- web-apache-pgsql/ubuntu/run_zabbix_component.sh | 2 +- web-nginx-mysql/alpine/run_zabbix_component.sh | 2 +- web-nginx-mysql/ubuntu/run_zabbix_component.sh | 2 +- web-nginx-pgsql/alpine/run_zabbix_component.sh | 2 +- web-nginx-pgsql/ubuntu/run_zabbix_component.sh | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/agent/alpine/run_zabbix_component.sh +++ b/agent/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/agent/ubuntu/run_zabbix_component.sh +++ b/agent/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/java-gateway/alpine/run_zabbix_component.sh +++ b/java-gateway/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/java-gateway/ubuntu/run_zabbix_component.sh +++ b/java-gateway/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/proxy-mysql/alpine/run_zabbix_component.sh +++ b/proxy-mysql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/proxy-mysql/ubuntu/run_zabbix_component.sh +++ b/proxy-mysql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/proxy-sqlite3/alpine/run_zabbix_component.sh +++ b/proxy-sqlite3/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh +++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/server-mysql/alpine/run_zabbix_component.sh +++ b/server-mysql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/server-mysql/ubuntu/run_zabbix_component.sh +++ b/server-mysql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/server-pgsql/alpine/run_zabbix_component.sh +++ b/server-pgsql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/server-pgsql/ubuntu/run_zabbix_component.sh +++ b/server-pgsql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-apache-mysql/alpine/run_zabbix_component.sh +++ b/web-apache-mysql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-apache-mysql/ubuntu/run_zabbix_component.sh +++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-apache-pgsql/alpine/run_zabbix_component.sh b/web-apache-pgsql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-apache-pgsql/alpine/run_zabbix_component.sh +++ b/web-apache-pgsql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-apache-pgsql/ubuntu/run_zabbix_component.sh b/web-apache-pgsql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-apache-pgsql/ubuntu/run_zabbix_component.sh +++ b/web-apache-pgsql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-nginx-mysql/alpine/run_zabbix_component.sh +++ b/web-nginx-mysql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-nginx-pgsql/alpine/run_zabbix_component.sh +++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh index cac24375e..73c4a03fb 100755 --- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh @@ -136,7 +136,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} From b011c4d16df8e3080308b056ca99af12cb2fdab1 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Oct 2017 19:05:18 +0300 Subject: [PATCH 12/20] Fixed MySQL user creation --- agent/alpine/Dockerfile | 4 ++-- agent/ubuntu/Dockerfile | 4 ++-- docker-compose_v2_alpine_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_alpine_pgsql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_pgsql_latest.yaml | 16 ++++++++-------- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- proxy-mysql/alpine/Dockerfile | 4 ++-- proxy-mysql/ubuntu/Dockerfile | 4 ++-- proxy-sqlite3/alpine/Dockerfile | 4 ++-- proxy-sqlite3/ubuntu/Dockerfile | 4 ++-- server-mysql/alpine/Dockerfile | 4 ++-- server-mysql/ubuntu/Dockerfile | 4 ++-- server-pgsql/alpine/Dockerfile | 4 ++-- server-pgsql/ubuntu/Dockerfile | 4 ++-- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 24 files changed, 72 insertions(+), 72 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index c323bebe0..e9981ae75 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -26,9 +26,9 @@ RUN addgroup zabbix && \ libssl1.0 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apk update && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index b36bc78a3..0971987ee 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -30,9 +30,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index 05a65dcb0..068d45dee 100644 --- a/docker-compose_v2_alpine_mysql_latest.yaml +++ b/docker-compose_v2_alpine_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:alpine-latest + image: zabbix/zabbix-server-mysql:alpine-trunk ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-trunk ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-latest + image: zabbix/zabbix-proxy-mysql:alpine-trunk ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:alpine-latest + image: zabbix/zabbix-web-apache-mysql:alpine-trunk ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:alpine-latest + image: zabbix/zabbix-web-nginx-mysql:alpine-trunk ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-latest + image: zabbix/zabbix-agent:alpine-trunk ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-latest + image: zabbix/zabbix-java-gateway:alpine-trunk ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml index 39ede361f..9051c1cb7 100644 --- a/docker-compose_v2_alpine_pgsql_latest.yaml +++ b/docker-compose_v2_alpine_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-latest + image: zabbix/zabbix-server-pgsql:alpine-trunk ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-trunk ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-latest + image: zabbix/zabbix-proxy-mysql:alpine-trunk ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:alpine-latest + image: zabbix/zabbix-web-apache-pgsql:alpine-trunk ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:alpine-latest + image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-latest + image: zabbix/zabbix-agent:alpine-trunk ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-latest + image: zabbix/zabbix-java-gateway:alpine-trunk ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index 70e2b34bc..535ceaa95 100644 --- a/docker-compose_v2_ubuntu_mysql_latest.yaml +++ b/docker-compose_v2_ubuntu_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:ubuntu-latest + image: zabbix/zabbix-server-mysql:ubuntu-trunk ports: - "10051:10051" volumes: @@ -44,7 +44,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk ports: - "10061:10051" volumes: @@ -84,7 +84,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-latest + image: zabbix/zabbix-proxy-mysql:ubuntu-trunk ports: - "10071:10051" volumes: @@ -125,7 +125,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:ubuntu-latest + image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk ports: - "80:80" - "443:443" @@ -156,7 +156,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest + image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk ports: - "8081:80" - "8443:443" @@ -187,7 +187,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-latest + image: zabbix/zabbix-agent:ubuntu-trunk ports: - "10050:10050" volumes: @@ -217,7 +217,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-latest + image: zabbix/zabbix-java-gateway:ubuntu-trunk ports: - "10052:10052" env_file: @@ -235,7 +235,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index 713a2e4f1..df40f14c2 100644 --- a/docker-compose_v2_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v2_ubuntu_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:ubuntu-latest + image: zabbix/zabbix-server-pgsql:ubuntu-trunk ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest + image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-latest + image: zabbix/zabbix-proxy-mysql:ubuntu-trunk ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest + image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest + image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-latest + image: zabbix/zabbix-agent:ubuntu-trunk ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-latest + image: zabbix/zabbix-java-gateway:ubuntu-trunk ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk ports: - "162:162/udp" volumes: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 1a8bffafa..2a84b2aa2 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -21,9 +21,9 @@ RUN addgroup zabbix && \ openjdk8-jre-base && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 78ebc9752..82431c6b1 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -27,9 +27,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 0590ceccf..1f521da80 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -44,9 +44,9 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index e34879fa6..a93d91be7 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -51,9 +51,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 73410db88..8b3fb969a 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -40,9 +40,9 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 676ef3bba..238b697a3 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,9 +49,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 3098cbdd6..d2be21bda 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -45,9 +45,9 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index f530b95d0..a177dc885 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,9 +52,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 0e878f8a7..3ac0f2719 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -45,9 +45,9 @@ RUN addgroup zabbix && \ libssh2 && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 729b28811..b171a703d 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,9 +52,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} RUN apt-get ${APT_FLAGS_COMMON} update && \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 5c1599151..27158e4c5 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -37,9 +37,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 3431e8bf5..c6c2f64ff 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -36,9 +36,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index a623f3390..65c1bbf35 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -36,9 +36,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 8c9ea2c6a..250157646 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -36,9 +36,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 2d41b97a8..00acc090e 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -36,9 +36,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 295dc00d0..86ccf25b0 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -44,9 +44,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 1b5a243e8..2ab34ac57 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -35,9 +35,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 8e34dcd6b..84eb4f398 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -44,9 +44,9 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=master +ARG MAJOR_VERSION=4.0 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ADD conf/tmp/font-config /tmp/font-config From 8ebd6b050dc568cc76d487c1d79582e3b3b5bcb9 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Oct 2017 22:44:30 +0300 Subject: [PATCH 13/20] Fixed trunk compilation --- agent/alpine/Dockerfile | 2 ++ agent/ubuntu/Dockerfile | 3 +++ java-gateway/alpine/Dockerfile | 1 + java-gateway/ubuntu/Dockerfile | 2 ++ proxy-mysql/alpine/Dockerfile | 4 ++++ proxy-mysql/ubuntu/Dockerfile | 6 ++++++ proxy-sqlite3/alpine/Dockerfile | 4 ++++ proxy-sqlite3/ubuntu/Dockerfile | 6 ++++++ server-mysql/alpine/Dockerfile | 4 ++++ server-mysql/ubuntu/Dockerfile | 6 ++++++ server-pgsql/alpine/Dockerfile | 4 ++++ server-pgsql/ubuntu/Dockerfile | 6 ++++++ 12 files changed, 48 insertions(+) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index e9981ae75..58a3d1b6d 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -23,6 +23,7 @@ RUN addgroup zabbix && \ supervisor \ bash \ coreutils \ + pcre \ libssl1.0 && \ rm -rf /var/cache/apk/* @@ -37,6 +38,7 @@ RUN apk update && \ automake \ autoconf \ openssl-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 0971987ee..bcf07b7c1 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -25,6 +25,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ supervisor \ + libpcre3 \ libssl1.0.0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -43,6 +44,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ libssl-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -75,6 +77,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ libssl-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 2a84b2aa2..e3648201d 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -32,6 +32,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ autoconf \ openjdk8 \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 82431c6b1..e1ee34315 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -40,6 +40,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ openjdk-7-jdk \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ @@ -68,6 +69,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libc6-dev \ pkg-config \ openjdk-7-jdk \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 1f521da80..594ec0a50 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -41,6 +41,8 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -62,6 +64,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index a93d91be7..24c08a41b 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -46,6 +46,8 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ fping \ + libevent-2.0 \ + libpcre3 \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -72,6 +74,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -120,6 +124,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ gcc \ libc6-dev \ make \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 8b3fb969a..60d37008c 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -37,6 +37,8 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -58,6 +60,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 238b697a3..ded1c2ca8 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -44,6 +44,8 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ fping \ + libevent-2.0-5 \ + libpcre3 \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -70,6 +72,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -121,6 +125,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index d2be21bda..fa552e361 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -42,6 +42,8 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -63,6 +65,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index a177dc885..ba7d88374 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -46,6 +46,8 @@ RUN locale-gen $LC_ALL && \ libssh2-1 \ libssl1.0.0 \ libxml2 \ + libevent-2.0 \ + libpcre3 \ fping \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -73,6 +75,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -127,6 +131,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 3ac0f2719..e31de6e45 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -42,6 +42,8 @@ RUN addgroup zabbix && \ libldap \ libcurl \ openipmi-libs \ + libevent \ + pcre \ libssh2 && \ rm -rf /var/cache/apk/* @@ -63,6 +65,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ curl-dev \ + libevent-dev \ + pcre-dev \ subversion && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index b171a703d..53a864dab 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -46,6 +46,8 @@ RUN locale-gen $LC_ALL && \ libssh2-1 \ libssl1.0.0 \ libxml2 \ + libevent-2.0 \ + libpcre3 \ fping \ libopenipmi0 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -73,6 +75,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ @@ -127,6 +131,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssh2-1-dev \ unixodbc-dev \ libxml2-dev \ + libevent-dev \ + libpcre3-dev \ subversion 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* From 19dc7d69e7287148ab33c75400234f9a7306ad5a Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 Nov 2017 15:43:26 +0200 Subject: [PATCH 14/20] Zabbix 3.4.4 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 9290b0d08..18e581a0c 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 865dc088d..bc9159a42 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 5f4ab863b..6ba187f27 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 dcff19dc3..fc0df1323 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 7031d0c1d..908066ba8 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index a4849d342..14fa59dae 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -54,7 +54,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index a315d6d65..d24d35fcd 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index f87c3f82c..84a4bb218 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 7c467507e..4bf3e8469 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 7fee9520f..90c839bd2 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index d09de58af..35198b794 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index c995382b6..a389be538 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 14c7bb66a..fc8c690c4 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 0babdf52b..ae074c216 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 8b0313181..b154783eb 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 03229f084..85ba6579c 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 a9a4d8303..8923e9ed6 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 2e3b8744c..01c11c4a2 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 7b3cb8360..5d5da0f0d 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 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 036f4ed48..c042a1317 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.3 +ARG ZBX_VERSION=${MAJOR_VERSION}.4 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From 5160cf3c0275d9fe32a944c539280a4cc990701f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Jan 2018 21:20:26 +0200 Subject: [PATCH 15/20] Zabbix 3.4.5 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 18e581a0c..5ad3d3e92 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 bc9159a42..f7eca71f2 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 6ba187f27..173b122eb 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 fc0df1323..6a1fcc075 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 908066ba8..b39628ee1 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 14fa59dae..5a8dae036 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -54,7 +54,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index d24d35fcd..50b322bff 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 84a4bb218..37f35cc1d 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 4bf3e8469..2c765c243 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 90c839bd2..70c37572e 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 35198b794..b78f32e74 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index a389be538..d4b419b11 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index fc8c690c4..563cba088 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 ae074c216..63c2de666 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 b154783eb..e6a15f121 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 85ba6579c..0f412698d 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 8923e9ed6..d40ea9bbf 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 01c11c4a2..dd64500e2 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 5d5da0f0d..fa6f9a421 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 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 c042a1317..4aeec72b6 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.4 +ARG ZBX_VERSION=${MAJOR_VERSION}.5 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} From e212ec751b0ee60f5efd4d2bd7a73476b5b7eb07 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Jan 2018 20:04:34 +0200 Subject: [PATCH 16/20] Zabbix 3.4.6 release --- agent/alpine/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- java-gateway/ubuntu/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-mysql/ubuntu/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-apache-pgsql/ubuntu/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-mysql/ubuntu/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- web-nginx-pgsql/ubuntu/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 5ad3d3e92..e6a763704 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index f7eca71f2..01d8ca314 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 173b122eb..377ef685b 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 6a1fcc075..37569fd3b 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index b39628ee1..52d2a1790 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 5a8dae036..5f7c0c09d 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -54,7 +54,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 50b322bff..d85225626 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 37f35cc1d..9a2408fc6 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -52,7 +52,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 2c765c243..fb26b076a 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 70c37572e..20ee4b38b 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index b78f32e74..40f75338d 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index d4b419b11..b27113d21 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 563cba088..1df68cbcd 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 63c2de666..7dcc3a2ed 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 e6a15f121..09c1bf859 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 0f412698d..6fa82fb1f 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 d40ea9bbf..b85798351 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 dd64500e2..96c5c2d0b 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 fa6f9a421..6264977d9 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup zabbix && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 4aeec72b6..f1726dc94 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -45,7 +45,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO rm -rf /var/lib/apt/lists/* ARG MAJOR_VERSION=3.4 -ARG ZBX_VERSION=${MAJOR_VERSION}.5 +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 b24419bca67d1db19e8162bfdb9e88c9d1769ee3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Feb 2018 07:02:17 -0800 Subject: [PATCH 17/20] Updated Kubernetes yaml --- kubernetes.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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: From 04af542f098baaf0e6d0a41286b690b8f79eb234 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Feb 2018 07:06:01 -0800 Subject: [PATCH 18/20] Updated Kubernetes yaml --- kubernetes.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kubernetes.yaml b/kubernetes.yaml index 40e162483..b37a655a3 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-trunk 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-trunk imagePullPolicy: Always ports: - containerPort: 10051 @@ -331,7 +331,7 @@ spec: mountPath: /var/lib/zabbix/snmptraps/ readOnly: true - name: zabbix-snmptraps - image: zabbix/zabbix-snmptraps:latest + image: zabbix/zabbix-snmptraps:ubuntu-trunk 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-trunk 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-trunk 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-trunk 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-trunk imagePullPolicy: Always resources: limits: From f4e4c3f70f7c8e745edb6c6598f114644540b789 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 10:22:18 -0800 Subject: [PATCH 19/20] Revert "Merge branch '3.4' into master" This reverts commit 49a0e5deb7ae061a54fe855aa3783efa327fe4d5, reversing changes made to b2bb957389d10b0ac1b1cbbbe62366348e1bd06e. --- 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_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 ++-- 25 files changed, 81 insertions(+), 124 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/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/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/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 17feae171..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/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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index e13d4746a..72d483ec5 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/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/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/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/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/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} From 8f39e80b6f7a60a20306de651c8d82c8cf445885 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 10:38:49 -0800 Subject: [PATCH 20/20] Revert "Merge branch 'trunk' into master" This reverts commit 78b62d9ce5c8966ba1f31b05bfb2ed32708da2e2, reversing changes made to f4e4c3f70f7c8e745edb6c6598f114644540b789. --- agent/alpine/Dockerfile | 10 +++++----- agent/ubuntu/Dockerfile | 7 ++----- docker-compose_v2_alpine_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_alpine_pgsql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_pgsql_latest.yaml | 16 ++++++++-------- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- 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 ++-- 25 files changed, 82 insertions(+), 125 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 347ab2b55..72ef3eb21 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -36,13 +36,12 @@ RUN addgroup zabbix && \ bash \ iputils \ libldap \ - pcre \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 5ce59c1cb..dcee51cdb 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -36,15 +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=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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 068d45dee..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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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 9051c1cb7..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-trunk + 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-trunk + 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-trunk + image: zabbix/zabbix-proxy-mysql:alpine-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:alpine-trunk + image: zabbix/zabbix-web-apache-pgsql:alpine-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk + 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-trunk + 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-trunk + 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-trunk + 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 535ceaa95..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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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 df40f14c2..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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index ebe98f512..4a5f6328b 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -34,9 +34,9 @@ RUN addgroup zabbix && \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index f7a170c19..673417e90 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -39,9 +39,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/kubernetes.yaml b/kubernetes.yaml index b37a655a3..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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + 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-trunk + image: zabbix/zabbix-agent:alpine-latest imagePullPolicy: Always resources: limits: diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 001a2e6d0..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,15 +52,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=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 134f3d220..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,9 +64,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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 265e115a6..4a15f1126 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -45,21 +45,19 @@ 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=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index c8b5408b2..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,9 +62,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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 c434172cb..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,14 +55,13 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 574d307a0..72d483ec5 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,9 +67,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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 50a185cab..60310b3b5 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,22 +48,20 @@ 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=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 2585eddd3..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,9 +67,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -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 4e3a2ed10..b9cda45bb 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -51,9 +51,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 6bdcd1880..624d255de 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -48,9 +48,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index e0f7bfc14..7f1cc5a5c 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -50,9 +50,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index c3cdbd1bf..2cadc2a5f 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -48,9 +48,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 4625d7ae5..4cde87fa0 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -50,9 +50,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 49ad357f1..1c2ff133b 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -58,9 +58,9 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 9e4748ef0..b23f4e4c0 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -49,9 +49,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 7c782307b..f6c15d2b3 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -59,9 +59,9 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \