diff --git a/manufacturer/container/services/.env b/manufacturer/container/services/.env index 6895b52..f66935b 100644 --- a/manufacturer/container/services/.env +++ b/manufacturer/container/services/.env @@ -4,4 +4,5 @@ MYSQL_ROOT_PASSWORD=wordpress MYSQL_USER=wordpress MYSQL_PASSWORD=wordpress +GF_SECURITY_ADMIN_PASSWORD=admin diff --git a/manufacturer/container/services/docker-compose.yml b/manufacturer/container/services/docker-compose.yml index 9a9f54d..9e30776 100644 --- a/manufacturer/container/services/docker-compose.yml +++ b/manufacturer/container/services/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.7' # Указание версии Docker Compose - services: db: image: mariadb:11.6.2 @@ -28,7 +26,7 @@ services: build: context: ../../../. dockerfile: manufacturer/container/apache/Dockerfile - image: custom-apache:v5.2 + image: custom-apache:v5.3 networks: metrics: ipv4_address: 10.10.1.2 @@ -52,9 +50,22 @@ services: ports: - "9090:9090" + grafana: + image: grafana/grafana:11.4.0 + networks: + metrics: + ipv4_address: 10.10.1.4 + ports: + - "3000:3000" + environment: + GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD} + volumes: + - grafana_data:/var/lib/grafana + volumes: - wordpress_data: db_data: + grafana_data: + wordpress_data: networks: db: