From ec613786c98b2a64f1884db03cc09efaee4c7e5c Mon Sep 17 00:00:00 2001 From: dotneft Date: Fri, 28 Oct 2016 07:09:29 -0700 Subject: [PATCH] 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}