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 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