From 1f69118725a85c3764f30cd8f0a35456abb44e0b Mon Sep 17 00:00:00 2001 From: Roman Zhilkin Date: Fri, 24 Jan 2025 07:55:38 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D0=B5=D0=B5=20=D1=87?= =?UTF-8?q?=D0=B8=D1=82=D0=B0=D0=B1=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=BE=D0=B2,=20?= =?UTF-8?q?=D1=81=D0=B5=D1=82=D0=B5=D0=B9=20=D0=B8=20=D1=82=D0=BE=D0=BC?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/services/docker-compose.yml | 85 ++++++++++--------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/manufacturer/container/services/docker-compose.yml b/manufacturer/container/services/docker-compose.yml index aaa9428..1f735bb 100644 --- a/manufacturer/container/services/docker-compose.yml +++ b/manufacturer/container/services/docker-compose.yml @@ -1,38 +1,41 @@ services: - db: + stransit-test-db: image: mariadb:11.6.2 + container_name: stransit-test-db environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} MYSQL_DATABASE: ${MYSQL_DATABASE} MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} networks: - db: + stransit-test-db: ipv4_address: 10.10.2.2 - hostname: wordpress_db + hostname: stransit-test-wordpress-db volumes: - db_data:/var/lib/mysql - wordpress: + stransit-test-wordpress: image: wordpress:6.7.1-php8.3-fpm-alpine + container_name: stransit-test-wordpress networks: - wp: - db: + stransit-test-wordpress: + stransit-test-db: ipv4_address: 10.10.2.3 volumes: - wordpress_data:/var/www/html extends: - service: db + service: stransit-test-db - apache: + stransit-test-apache: build: context: ../../../. dockerfile: manufacturer/container/apache/Dockerfile - image: custom-apache:v5.3 + image: stransit-test-apache:v1 + container_name: stransit-test-apache networks: - metrics: + stransit-test-metrics: ipv4_address: 10.10.1.2 - wp: + stransit-test-wordpress: ports: - "80:80" - "443:443" @@ -40,37 +43,43 @@ services: - wordpress_data:/var/www/html - ../../configs/apache/apache.conf:/etc/apache2/sites-available/000-default.conf depends_on: - - wordpress + - stransit-test-wordpress - prometheus: - image: prom/prometheus:v3.1.0 - volumes: - - ../../configs/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml - networks: - metrics: - ipv4_address: 10.10.1.3 - ports: - - "9090:9090" - - exporter: + stransit-test-exporter: image: lusotycoon/apache-exporter - container_name: exporter + container_name: stransit-test-exporter privileged: true networks: - metrics: + stransit-test-metrics: ipv4_address: 10.10.1.5 ports: - - mode: ingress - target: 9117 - published: "9117" - protocol: tcp + - mode: ingress + target: 9117 + published: "9117" + protocol: tcp + depends_on: + - stransit-test-apache restart: unless-stopped entrypoint: /bin/apache_exporter --scrape_uri="http://10.10.1.2/server-status?auto" - grafana: - image: grafana/grafana:11.4.0 + stransit-test-prometheus: + image: prom/prometheus:v3.1.0 + container_name: stransit-test-prometheus + volumes: + - ../../configs/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml networks: - metrics: + stransit-test-metrics: + ipv4_address: 10.10.1.3 + ports: + - "9090:9090" + depends_on: + - stransit-test-exporter + + stransit-test-grafana: + image: grafana/grafana:11.4.0 + container_name: stransit-test-grafana + networks: + stransit-test-metrics: ipv4_address: 10.10.1.4 ports: - "3000:3000" @@ -88,21 +97,21 @@ volumes: wordpress_data: networks: - db: - name: db + stransit-test-db: + name: stransit-test-db driver: bridge external: false ipam: config: - subnet: 10.10.2.0/24 - wp: - name: wp + stransit-test-wordpress: + name: stransit-test-wordpress driver: bridge external: false - metrics: - name: metrics + stransit-test-metrics: + name: stransit-test-metrics driver: bridge external: false ipam: From 9e298422c49b474739d2ce1b3235e488b6cdceb3 Mon Sep 17 00:00:00 2001 From: Roman Zhilkin Date: Fri, 24 Jan 2025 07:55:53 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20ID=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B0=D0=BD=D1=8B=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5=20=D0=B0=D0=BA=D1=82=D1=83=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manufacturer/container/services/.env | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manufacturer/container/services/.env b/manufacturer/container/services/.env index 9facf63..3725fbe 100644 --- a/manufacturer/container/services/.env +++ b/manufacturer/container/services/.env @@ -1,10 +1,12 @@ +COMPOSE_DOCKER_PROJECT=stransit-test + MYSQL_HOST=db MYSQL_DATABASE=wordpress MYSQL_ROOT_PASSWORD=wordpress MYSQL_USER=wordpress MYSQL_PASSWORD=wordpress +DASHBOARD_ID=3894 GRAFANA_URL=10.10.1.4 -DASHBOARD_ID=893 GF_SECURITY_ADMIN_PASSWORD=admin