From 2de39b60b8f91223016d32667c203d53843f68c4 Mon Sep 17 00:00:00 2001
From: Roman Zhilkin <mrutsy@zhs.one>
Date: Sat, 25 Jan 2025 07:00:30 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=87=D0=B5?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B5=D1=80=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manufacturer/container/services/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manufacturer/container/services/docker-compose.yml b/manufacturer/container/services/docker-compose.yml
index ed5457e..d33cbfe 100644
--- a/manufacturer/container/services/docker-compose.yml
+++ b/manufacturer/container/services/docker-compose.yml
@@ -97,6 +97,7 @@ services:
     container_name: stransit-test-grafana-importer
     networks:
       stransit-test-metrics:
+        - ipv4_address: 10.10.1.5
     volumes:
       - ../grafana/scripts/import_apache_dashboard.sh:/scripts/import_apache_dashboard.sh
       - ../../configs/grafana/provisioning/dashboards/default/apache.json:/scripts/apache.json

From ba74527262d39c74096ad25c44277474e3918592 Mon Sep 17 00:00:00 2001
From: Roman Zhilkin <mrutsy@zhs.one>
Date: Sat, 25 Jan 2025 07:03:41 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B3=D1=80=D0=B0=D1=84=D0=B0=D0=BD=D1=8B?=
 =?UTF-8?q?=20=D0=B8=20=D1=81=D0=B0=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D0=B8=D0=B7=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 launcher.sh | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/launcher.sh b/launcher.sh
index 5fa58ea..36ce69f 100644
--- a/launcher.sh
+++ b/launcher.sh
@@ -1,7 +1,23 @@
 #!/bin/bash
 
-docker stop stransit-test-grafana
-docker rm stransit-test-grafana
-docker volume rm stransit-test_grafana_data
+# Проверка наличия аргумента для обновления
+if [ "$1" == "update" ]; then
+    # Проверка существования контейнера
+    if [ $(docker ps -a -q -f name=stransit-test-grafana) ]; then
+        docker stop stransit-test-grafana
+        docker rm stransit-test-grafana
+    fi
 
-docker-compose -f manufacturer/container/services/docker-compose.yml up -d
\ No newline at end of file
+    # Проверка существования тома
+    if [ $(docker volume ls -q -f name=stransit_test_grafana_data) ]; then
+        docker volume rm stransit_test_grafana_data
+    fi
+fi
+
+# Проверка наличия git и выполнение git pull
+if command -v git &> /dev/null; then
+    git pull
+fi
+
+# Запуск docker-compose
+docker-compose -f manufacturer/container/services/docker-compose.yml up -d