diff --git a/install.sh b/install.sh index 1071a52..fdd01e9 100644 --- a/install.sh +++ b/install.sh @@ -465,8 +465,8 @@ prompt_mikrus_host prompt_mikrus_apikey prompt_api_secret -calculate(){ - docker compose --env-file /srv/nightscout/config/deployment.env -f /srv/nightscout/config/docker-compose up -d +install_containers(){ + docker-compose --env-file /srv/nightscout/config/deployment.env -f /srv/nightscout/config/docker-compose.yml up -d } showprogress(){ @@ -503,7 +503,10 @@ NS_ID=$(docker ps -a --no-trunc --filter name=^ns-server --format '{{ .ID }}') if [[ "$NS_ID" =~ [0-9a-fA-F]{12,} ]]; then whiptail --msgbox "Nigtscout już działa!" 5 12 else - processgauge calculate "Todo" + ##processgauge calculate "Todo" fi +whiptail --msgbox "Odpalam" 5 12 +install_containers +whiptail --msgbox "Gotowe!" 5 12 diff --git a/src/setup.sh b/src/setup.sh index 7cde636..9552257 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -31,8 +31,8 @@ prompt_mikrus_host prompt_mikrus_apikey prompt_api_secret -calculate(){ - docker compose --env-file /srv/nightscout/config/deployment.env -f /srv/nightscout/config/docker-compose up -d +install_containers(){ + docker-compose --env-file /srv/nightscout/config/deployment.env -f /srv/nightscout/config/docker-compose.yml up -d } showprogress(){ @@ -69,7 +69,10 @@ NS_ID=$(docker ps -a --no-trunc --filter name=^ns-server --format '{{ .ID }}') if [[ "$NS_ID" =~ [0-9a-fA-F]{12,} ]]; then whiptail --msgbox "Nigtscout już działa!" 5 12 else - processgauge calculate "Todo" + ##processgauge calculate "Todo" fi +whiptail --msgbox "Odpalam" 5 12 +install_containers +whiptail --msgbox "Gotowe!" 5 12 diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml index db63981..17bc0dd 100644 --- a/templates/docker-compose.yml +++ b/templates/docker-compose.yml @@ -52,5 +52,3 @@ services: - ns-tier depends_on: - mongodb - profiles: - - admin \ No newline at end of file