diff --git a/devenv/default/docker-compose.yml b/devenv/default/docker-compose.yml index b1bf37b..8ca6edc 100644 --- a/devenv/default/docker-compose.yml +++ b/devenv/default/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: # Grafana @@ -7,21 +7,21 @@ services: build: context: ./ args: - grafana_version: ${GRAFANA_VERSION:-9.2.5} + grafana_version: ${GRAFANA_VERSION:-10.1.2} ports: - 3000:3000/tcp volumes: - ../../dist:/grafana-zabbix - ../dashboards:/devenv/dashboards - ../grafana.ini:/etc/grafana/grafana.ini:ro - - "../datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml" - - "../dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml" + - '../datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml' + - '../dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml' # Zabbix zabbix-server: image: zabbix/zabbix-server-pgsql:alpine-6.0-latest ports: - - "10051:10051" + - '10051:10051' depends_on: - database environment: @@ -38,7 +38,7 @@ services: zabbix-web: image: zabbix/zabbix-web-apache-pgsql:alpine-6.0-latest ports: - - "8188:8080" + - '8188:8080' depends_on: - database - zabbix-server @@ -52,9 +52,9 @@ services: POSTGRES_DB: zabbix database: - image: postgres + image: postgres:15 ports: - - "15432:5432" + - '15432:5432' command: postgres -c 'max_connections=1000' environment: POSTGRES_USER: zabbix diff --git a/devenv/zabbix50/docker-compose.yml b/devenv/zabbix50/docker-compose.yml index 227d0bd..430c717 100644 --- a/devenv/zabbix50/docker-compose.yml +++ b/devenv/zabbix50/docker-compose.yml @@ -1,11 +1,11 @@ -version: "3" +version: '3' services: # Zabbix zabbix-server: image: zabbix/zabbix-server-pgsql:alpine-5.0-latest ports: - - "10051:10051" + - '10051:10051' depends_on: - database environment: @@ -18,8 +18,8 @@ services: zabbix-web: image: zabbix/zabbix-web-apache-pgsql:alpine-5.0-latest ports: - - "8188:8080" - - "8189:8443" + - '8188:8080' + - '8189:8443' # - "8188:80" depends_on: - database @@ -37,9 +37,9 @@ services: - ./ssl:/etc/ssl/apache2:ro database: - image: postgres + image: postgres:14 ports: - - "15432:5432" + - '15432:5432' environment: POSTGRES_USER: zabbix POSTGRES_PASSWORD: zabbix diff --git a/devenv/zabbix60/docker-compose.yml b/devenv/zabbix60/docker-compose.yml index dc81139..809eccb 100644 --- a/devenv/zabbix60/docker-compose.yml +++ b/devenv/zabbix60/docker-compose.yml @@ -1,23 +1,23 @@ -version: "3" +version: '3' services: # Grafana grafana: - image: grafana/grafana:8.4.7 + image: grafana/grafana:10.1.2 ports: - - "3001:3000" + - '3001:3000' volumes: - ../..:/grafana-zabbix - ../dashboards:/devenv/dashboards - ../grafana.ini:/etc/grafana/grafana.ini:ro - - "../datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml" - - "../dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml" + - '../datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml' + - '../dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml' # Zabbix zabbix-server: image: zabbix/zabbix-server-pgsql:alpine-6.0-latest ports: - - "10051:10051" + - '10051:10051' depends_on: - database environment: @@ -34,7 +34,7 @@ services: zabbix-web: image: zabbix/zabbix-web-apache-pgsql:alpine-6.0-latest ports: - - "8188:8080" + - '8188:8080' depends_on: - database - zabbix-server @@ -48,9 +48,9 @@ services: POSTGRES_DB: zabbix database: - image: postgres + image: postgres:15 ports: - - "15432:5432" + - '15432:5432' command: postgres -c 'max_connections=1000' environment: POSTGRES_USER: zabbix diff --git a/devenv/zabbix62/docker-compose.yml b/devenv/zabbix62/docker-compose.yml index c3ca254..68ad158 100644 --- a/devenv/zabbix62/docker-compose.yml +++ b/devenv/zabbix62/docker-compose.yml @@ -1,23 +1,23 @@ -version: "3" +version: '3' services: # Grafana grafana: image: grafana/grafana:10.1.2 ports: - - "3001:3000" + - '3001:3000' volumes: - ../..:/grafana-zabbix - ../dashboards:/devenv/dashboards - ../grafana.ini:/etc/grafana/grafana.ini:ro - - "../datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml" - - "../dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml" + - '../datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml' + - '../dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml' # Zabbix zabbix-server: image: zabbix/zabbix-server-pgsql:alpine-6.2-latest ports: - - "10051:10051" + - '10051:10051' depends_on: - database environment: @@ -34,7 +34,7 @@ services: zabbix-web: image: zabbix/zabbix-web-apache-pgsql:alpine-6.2-latest ports: - - "8188:8080" + - '8188:8080' depends_on: - database - zabbix-server @@ -50,7 +50,7 @@ services: database: image: postgres:15 ports: - - "15432:5432" + - '15432:5432' command: postgres -c 'max_connections=1000' environment: POSTGRES_USER: zabbix