Added profiles for compose files: default, full, all

kbuddy · Apr 9, 2021 · bef77c5 · bef77c5
1 parent 3337cbd
commit bef77c5
Show file tree

Hide file tree

Showing 12 changed files with 276 additions and 278 deletions.
diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -14,9 +14,6 @@ services:
    - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
    - snmptraps:/var/lib/zabbix/snmptraps:rw
-  links:
-   - mysql-server:mysql-server
-   - zabbix-java-gateway:zabbix-java-gateway
   ulimits:
    nproc: 65535
    nofile:
@@ -39,8 +36,6 @@ services:
    - MYSQL_ROOT_PASSWORD
   depends_on:
    - mysql-server
-   - zabbix-java-gateway
-   - zabbix-snmptraps
   networks:
    zbx_net_backend:
      aliases:
@@ -66,6 +61,8 @@ services:
 
  zabbix-proxy-sqlite3:
   image: zabbix/zabbix-proxy-sqlite3:alpine-latest
+  profiles:
+   - all
   ports:
    - "10061:10051"
   volumes:
@@ -77,9 +74,6 @@ services:
    - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
    - snmptraps:/var/lib/zabbix/snmptraps:rw
-  links:
-   - zabbix-server:zabbix-server
-   - zabbix-java-gateway:zabbix-java-gateway
   ulimits:
    nproc: 65535
    nofile:
@@ -116,6 +110,8 @@ services:
 
  zabbix-proxy-mysql:
   image: zabbix/zabbix-proxy-mysql:alpine-latest
+  profiles:
+   - all
   ports:
    - "10071:10051"
   volumes:
@@ -127,9 +123,6 @@ services:
    - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
    - snmptraps:/var/lib/zabbix/snmptraps:rw
-  links:
-   - zabbix-server:zabbix-server
-   - zabbix-java-gateway:zabbix-java-gateway
   ulimits:
    nproc: 65535
    nofile:
@@ -151,6 +144,10 @@ services:
    - mysql-server
    - zabbix-java-gateway
    - zabbix-snmptraps
+  secrets:
+   - MYSQL_USER
+   - MYSQL_PASSWORD
+   - MYSQL_ROOT_PASSWORD
   networks:
    zbx_net_backend:
     aliases:
@@ -168,12 +165,11 @@ services:
 
  zabbix-web-apache-mysql:
   image: zabbix/zabbix-web-apache-mysql:alpine-latest
+  profiles:
+   - all
   ports:
-   - "80:8080"
-   - "443:8443"
-  links:
-   - mysql-server:mysql-server
-   - zabbix-server:zabbix-server
+   - "8081:8080"
+   - "8443:8443"
   volumes:
    - /etc/localtime:/etc/localtime:ro
    - /etc/timezone:/etc/timezone:ro
@@ -222,11 +218,8 @@ services:
  zabbix-web-nginx-mysql:
   image: zabbix/zabbix-web-nginx-mysql:alpine-latest
   ports:
-   - "8081:8080"
-   - "8443:8443"
-  links:
-   - mysql-server:mysql-server
-   - zabbix-server:zabbix-server
+   - "80:8080"
+   - "443:8443"
   volumes:
    - /etc/localtime:/etc/localtime:ro
    - /etc/timezone:/etc/timezone:ro
@@ -274,6 +267,9 @@ services:
 
  zabbix-agent:
   image: zabbix/zabbix-agent:alpine-latest
+  profiles:
+   - full
+   - all
   ports:
    - "10050:10050"
   volumes:
@@ -283,8 +279,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
-  links:
-   - zabbix-server:zabbix-server
   deploy:
    resources:
     limits:
@@ -313,6 +307,9 @@ services:
 
  zabbix-java-gateway:
   image: zabbix/zabbix-java-gateway:alpine-latest
+  profiles:
+   - full
+   - all
   ports:
    - "10052:10052"
   deploy:
@@ -339,6 +336,9 @@ services:
 
  zabbix-snmptraps:
   image: zabbix/zabbix-snmptraps:alpine-latest
+  profiles:
+   - full
+   - all
   ports:
    - "162:1162/udp"
   volumes:

diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
@@ -18,9 +18,6 @@ services:
    - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
    - snmptraps:/var/lib/zabbix/snmptraps:rw
-  links:
-   - mysql-server:mysql-server
-   - zabbix-java-gateway:zabbix-java-gateway
   ulimits:
    nproc: 65535
    nofile:
@@ -43,8 +40,6 @@ services:
    - MYSQL_ROOT_PASSWORD
   depends_on:
    - mysql-server
-   - zabbix-java-gateway
-   - zabbix-snmptraps
   networks:
    zbx_net_backend:
      aliases:
@@ -74,6 +69,8 @@ services:
    cache_from:
     - alpine:3.11
   image: zabbix-proxy-sqlite3:alpine-local
+  profiles:
+   - all
   ports:
    - "10061:10051"
   volumes:
@@ -85,9 +82,6 @@ services:
    - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
    - snmptraps:/var/lib/zabbix/snmptraps:rw
-  links:
-   - zabbix-server:zabbix-server
-   - zabbix-java-gateway:zabbix-java-gateway
   ulimits:
    nproc: 65535
    nofile:
@@ -128,6 +122,8 @@ services:
    cache_from:
     - alpine:3.11
   image: zabbix-proxy-mysql:alpine-local
+  profiles:
+   - all
   ports:
    - "10071:10051"
   volumes:
@@ -139,9 +135,6 @@ services:
    - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
    - snmptraps:/var/lib/zabbix/snmptraps:rw
-  links:
-   - zabbix-server:zabbix-server
-   - zabbix-java-gateway:zabbix-java-gateway
   ulimits:
    nproc: 65535
    nofile:
@@ -163,6 +156,10 @@ services:
    - mysql-server
    - zabbix-java-gateway
    - zabbix-snmptraps
+  secrets:
+   - MYSQL_USER
+   - MYSQL_PASSWORD
+   - MYSQL_ROOT_PASSWORD
   networks:
    zbx_net_backend:
     aliases:
@@ -184,12 +181,11 @@ services:
    cache_from:
     - alpine:3.11
   image: zabbix-web-apache-mysql:alpine-local
+  profiles:
+   - all
   ports:
-   - "80:8080"
-   - "443:8443"
-  links:
-   - mysql-server:mysql-server
-   - zabbix-server:zabbix-server
+   - "8081:8080"
+   - "8443:8443"
   volumes:
    - /etc/localtime:/etc/localtime:ro
    - /etc/timezone:/etc/timezone:ro
@@ -242,11 +238,8 @@ services:
     - alpine:3.11
   image: zabbix-web-nginx-mysql:alpine-local
   ports:
-   - "8081:8080"
-   - "8443:8443"
-  links:
-   - mysql-server:mysql-server
-   - zabbix-server:zabbix-server
+   - "80:8080"
+   - "443:8443"
   volumes:
    - /etc/localtime:/etc/localtime:ro
    - /etc/timezone:/etc/timezone:ro
@@ -298,6 +291,9 @@ services:
    cache_from:
     - alpine:3.11
   image: zabbix-agent:alpine-local
+  profiles:
+   - full
+   - all
   ports:
    - "10050:10050"
   volumes:
@@ -307,8 +303,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
-  links:
-   - zabbix-server:zabbix-server
   deploy:
    resources:
     limits:
@@ -341,6 +335,9 @@ services:
    cache_from:
     - alpine:3.11
   image: zabbix-java-gateway:alpine-local
+  profiles:
+   - full
+   - all
   ports:
    - "10052:10052"
   deploy:
@@ -371,6 +368,9 @@ services:
    cache_from:
     - alpine:3.11
   image: zabbix-snmptraps:alpine-local
+  profiles:
+   - full
+   - all
   ports:
    - "162:1162/udp"
   volumes: