diff --git a/Makefile b/Makefile index fd2d6cc..77912d9 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ DS_SSH_PORT := 22 DS_PATH := /volume1/docker/ban-yaro CONTAINER := ban-yaro GIT_REMOTE := origin +DOCKER := sudo /usr/local/bin/docker # tar: was NICHT auf die DS übertragen wird TAR_EXCLUDE := --exclude='.git' \ @@ -75,12 +76,12 @@ deploy: check-ssh @echo "→ Docker rebuild + restart..." @ssh $(DS_HOST) " \ cd $(DS_PATH) && \ - sudo docker compose down && \ - sudo docker compose build --no-cache && \ - sudo docker compose up -d" + $(DOCKER) compose down && \ + $(DOCKER) compose build --no-cache && \ + $(DOCKER) compose up -d" @echo "" @echo " ✓ Deploy fertig. Letzte Logs:" - @ssh $(DS_HOST) "sudo docker logs $(CONTAINER) --tail=15" + @ssh $(DS_HOST) "$(DOCKER) logs $(CONTAINER) --tail=15" # ---------------------------------------------------------- # SYNC — nur Dateien übertragen, kein Docker @@ -105,7 +106,7 @@ push: restart: check-ssh @ssh $(DS_HOST) " \ cd $(DS_PATH) && \ - sudo docker compose restart $(CONTAINER)" + $(DOCKER) compose restart $(CONTAINER)" @echo " ✓ Neugestartet." # ---------------------------------------------------------- @@ -114,20 +115,20 @@ restart: check-ssh build: check-ssh @ssh $(DS_HOST) " \ cd $(DS_PATH) && \ - sudo docker compose build --no-cache" + $(DOCKER) compose build --no-cache" # ---------------------------------------------------------- # STOP # ---------------------------------------------------------- stop: check-ssh - @ssh $(DS_HOST) "cd $(DS_PATH) && sudo docker compose down" + @ssh $(DS_HOST) "cd $(DS_PATH) && $(DOCKER) compose down" @echo " ✓ Gestoppt." # ---------------------------------------------------------- # STATUS # ---------------------------------------------------------- status: check-ssh - @ssh $(DS_HOST) "sudo docker ps \ + @ssh $(DS_HOST) "$(DOCKER) ps \ --filter name=$(CONTAINER) \ --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'" @@ -135,22 +136,22 @@ status: check-ssh # LOGS # ---------------------------------------------------------- logs: check-ssh - @ssh $(DS_HOST) "sudo docker logs $(CONTAINER) --tail=100" + @ssh $(DS_HOST) "$(DOCKER) logs $(CONTAINER) --tail=100" logs-f: check-ssh - @ssh $(DS_HOST) "sudo docker logs $(CONTAINER) -f" + @ssh $(DS_HOST) "$(DOCKER) logs $(CONTAINER) -f" # ---------------------------------------------------------- # SHELL im Container # ---------------------------------------------------------- shell: check-ssh - @ssh -t $(DS_HOST) "sudo docker exec -it $(CONTAINER) bash" + @ssh -t $(DS_HOST) "$(DOCKER) exec -it $(CONTAINER) bash" # ---------------------------------------------------------- # SQLite # ---------------------------------------------------------- db: check-ssh - @ssh -t $(DS_HOST) "sudo docker exec -it $(CONTAINER) \ + @ssh -t $(DS_HOST) "$(DOCKER) exec -it $(CONTAINER) \ sqlite3 /data/banyaro.db" # ---------------------------------------------------------- diff --git a/scripts/setup-ds.sh b/scripts/setup-ds.sh index d8498e6..5c30c5a 100755 --- a/scripts/setup-ds.sh +++ b/scripts/setup-ds.sh @@ -120,8 +120,8 @@ echo "→ Docker build (dauert 2-3 Minuten)..." ssh "$DS_HOST" " cd '${DS_PATH}' && - sudo docker compose build && - sudo docker compose up -d + sudo /usr/local/bin/docker compose build && + sudo /usr/local/bin/docker compose up -d " ok "Container gestartet" @@ -133,7 +133,7 @@ echo "→ Warte auf App-Start..." sleep 5 STATUS=$(ssh "$DS_HOST" \ - "sudo docker ps --filter name=ban-yaro --format '{{.Status}}'" 2>/dev/null || true) + "sudo /usr/local/bin/docker ps --filter name=ban-yaro --format '{{.Status}}'" 2>/dev/null || true) if echo "$STATUS" | grep -q "Up"; then ok "Container läuft — ${STATUS}"