Added profiles for compose files: default, full, all

kailongapple · Apr 10, 2021 · e52a508 · e52a508
2 parents 108b975 + b3a50fe
commit e52a508
Show file tree

Hide file tree

Showing 16 changed files with 314 additions and 300 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -74,7 +74,11 @@ jobs:
       - name: Prepare platform list
         id: platform
         run: |
-          DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
+          DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le"
+          
+          if [ "${{ matrix.build }}" == "agent2" ]; then
+            DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
+          fi
 
           if [ "${{ matrix.os }}" == "ubuntu" ]; then
             DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le"
@@ -179,4 +183,4 @@ jobs:
 
       -
         name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -15,9 +15,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:
 #   - root-ca.pem
   depends_on:
    - mysql-server
-   - zabbix-java-gateway
-   - zabbix-snmptraps
   networks:
    zbx_net_backend:
      aliases:
@@ -70,6 +65,8 @@ services:
 
  zabbix-proxy-sqlite3:
   image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
+  profiles:
+   - all
   ports:
    - "10061:10051"
   volumes:
@@ -81,9 +78,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:
@@ -120,6 +114,8 @@ services:
 
  zabbix-proxy-mysql:
   image: zabbix/zabbix-proxy-mysql:alpine-trunk
+  profiles:
+   - all
   ports:
    - "10071:10051"
   volumes:
@@ -131,9 +127,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:
@@ -179,12 +172,11 @@ services:
 
  zabbix-web-apache-mysql:
   image: zabbix/zabbix-web-apache-mysql:alpine-trunk
+  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
@@ -237,11 +229,8 @@ services:
  zabbix-web-nginx-mysql:
   image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
   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
@@ -293,6 +282,9 @@ services:
 
  zabbix-agent:
   image: zabbix/zabbix-agent:alpine-trunk
+  profiles:
+   - full
+   - all
   ports:
    - "10050:10050"
   volumes:
@@ -302,8 +294,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:
@@ -332,6 +322,9 @@ services:
 
  zabbix-java-gateway:
   image: zabbix/zabbix-java-gateway:alpine-trunk
+  profiles:
+   - full
+   - all
   ports:
    - "10052:10052"
   deploy:
@@ -358,6 +351,9 @@ services:
 
  zabbix-snmptraps:
   image: zabbix/zabbix-snmptraps:alpine-trunk
+  profiles:
+   - full
+   - all
   ports:
    - "162:1162/udp"
   volumes:
@@ -419,6 +415,9 @@ services:
 
 # elasticsearch:
 #  image: elasticsearch
+#  profiles:
+#   - full
+#   - all
 #  environment:
 #   - transport.host=0.0.0.0
 #   - discovery.zen.minimum_master_nodes=1

diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
@@ -4,7 +4,7 @@ services:
   build: 
    context: ./server-mysql/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   image: zabbix-server-mysql:alpine-local
   ports:
    - "10051:10051"
@@ -19,9 +19,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:
@@ -47,8 +44,6 @@ services:
 #   - root-ca.pem
   depends_on:
    - mysql-server
-   - zabbix-java-gateway
-   - zabbix-snmptraps
   networks:
    zbx_net_backend:
      aliases:
@@ -76,8 +71,10 @@ services:
   build:
    context: ./proxy-sqlite3/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   image: zabbix-proxy-sqlite3:alpine-local
+  profiles:
+   - all
   ports:
    - "10061:10051"
   volumes:
@@ -89,9 +86,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:
@@ -130,8 +124,10 @@ services:
   build:
    context: ./proxy-mysql/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   image: zabbix-proxy-mysql:alpine-local
+  profiles:
+   - all
   ports:
    - "10071:10051"
   volumes:
@@ -143,9 +139,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:
@@ -193,14 +186,13 @@ services:
   build:
    context: ./web-apache-mysql/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   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
@@ -254,14 +246,11 @@ services:
   build:
    context: ./web-nginx-mysql/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   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
@@ -315,8 +304,11 @@ services:
   build:
    context: ./agent/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   image: zabbix-agent:alpine-local
+  profiles:
+   - full
+   - all
   ports:
    - "10050:10050"
   volumes:
@@ -326,8 +318,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:
@@ -358,8 +348,11 @@ services:
   build:
    context: ./java-gateway/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   image: zabbix-java-gateway:alpine-local
+  profiles:
+   - full
+   - all
   ports:
    - "10052:10052"
   deploy:
@@ -388,8 +381,11 @@ services:
   build:
    context: ./snmptraps/alpine
    cache_from:
-    - alpine:3.12
+    - alpine:3.13
   image: zabbix-snmptraps:alpine-local
+  profiles:
+   - full
+   - all
   ports:
    - "162:1162/udp"
   volumes:
@@ -451,6 +447,9 @@ services:
 
 # elasticsearch:
 #  image: elasticsearch
+#  profiles:
+#   - full
+#   - all
 #  environment:
 #   - transport.host=0.0.0.0
 #   - discovery.zen.minimum_master_nodes=1