diff --git a/makefile b/makefile index e27c0bb..311c4db 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ b: u: # запуск контейнеров $(eval IP := $(shell curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me)) bash ./update/update.sh & - touch ./override.env + touch ./override.env ./docker-compose.override.yml IP=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate d: # остановка контейнеров -kill -9 $(shell cat ./update/update_pid) > /dev/null diff --git a/scripts/vpnbot.service b/scripts/vpnbot.service index 50a2729..b521124 100644 --- a/scripts/vpnbot.service +++ b/scripts/vpnbot.service @@ -6,7 +6,7 @@ After=docker.service Type=oneshot RemainAfterExit=yes WorkingDirectory=path -ExecStartPre=/bin/sh -c "touch ./override.env" +ExecStartPre=/bin/sh -c "touch ./override.env ./docker-compose.override.yml" ExecStart=/bin/sh -c "IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate" ExecStartPost=/bin/sh -c "bash ./update/update.sh &" ExecStop=/bin/sh -c "docker compose down --remove-orphans" diff --git a/update/update.sh b/update/update.sh index 3b85a2f..c63e39a 100755 --- a/update/update.sh +++ b/update/update.sh @@ -12,7 +12,7 @@ do key=$(cat $pwd/update/key) curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "останавливаю бота"/')" docker compose down --remove-orphans - if [[ "$cmd" == 1]] + if [[ "$cmd" == "1"]] then curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "очищаю директорию"/')" git reset --hard && git clean -fd