rene/banyaro
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Docker: voller Pfad /usr/local/bin/docker auf DS (nicht im PATH)

Browse source
This commit is contained in:
rene 2026-04-12 16:57:16 +02:00
parent 569816d9a4
commit e466a5b4f0
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Makefile
View file

@ -10,6 +10,7 @@ DS_SSH_PORT := 22
DS_PATH := /volume1/docker/ban-yaro DS_PATH := /volume1/docker/ban-yaro
CONTAINER := ban-yaro CONTAINER := ban-yaro
GIT_REMOTE := origin GIT_REMOTE := origin
DOCKER := sudo /usr/local/bin/docker
# tar: was NICHT auf die DS übertragen wird # tar: was NICHT auf die DS übertragen wird
TAR_EXCLUDE := --exclude='.git' \ TAR_EXCLUDE := --exclude='.git' \
@ -75,12 +76,12 @@ deploy: check-ssh
@echo "→ Docker rebuild + restart..." @echo "→ Docker rebuild + restart..."
@ssh $(DS_HOST) " \ @ssh $(DS_HOST) " \
cd $(DS_PATH) && \ cd $(DS_PATH) && \
sudo docker compose down && \ $(DOCKER) compose down && \
sudo docker compose build --no-cache && \ $(DOCKER) compose build --no-cache && \
sudo docker compose up -d" $(DOCKER) compose up -d"
@echo "" @echo ""
@echo " ✓ Deploy fertig. Letzte Logs:" @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 # SYNC — nur Dateien übertragen, kein Docker
@ -105,7 +106,7 @@ push:
restart: check-ssh restart: check-ssh
@ssh $(DS_HOST) " \ @ssh $(DS_HOST) " \
cd $(DS_PATH) && \ cd $(DS_PATH) && \
sudo docker compose restart $(CONTAINER)" $(DOCKER) compose restart $(CONTAINER)"
@echo " ✓ Neugestartet." @echo " ✓ Neugestartet."
# ---------------------------------------------------------- # ----------------------------------------------------------
@ -114,20 +115,20 @@ restart: check-ssh
build: check-ssh build: check-ssh
@ssh $(DS_HOST) " \ @ssh $(DS_HOST) " \
cd $(DS_PATH) && \ cd $(DS_PATH) && \
sudo docker compose build --no-cache" $(DOCKER) compose build --no-cache"
# ---------------------------------------------------------- # ----------------------------------------------------------
# STOP # STOP
# ---------------------------------------------------------- # ----------------------------------------------------------
stop: check-ssh stop: check-ssh
@ssh $(DS_HOST) "cd $(DS_PATH) && sudo docker compose down" @ssh $(DS_HOST) "cd $(DS_PATH) && $(DOCKER) compose down"
@echo " ✓ Gestoppt." @echo " ✓ Gestoppt."
# ---------------------------------------------------------- # ----------------------------------------------------------
# STATUS # STATUS
# ---------------------------------------------------------- # ----------------------------------------------------------
status: check-ssh status: check-ssh
@ssh $(DS_HOST) "sudo docker ps \ @ssh $(DS_HOST) "$(DOCKER) ps \
--filter name=$(CONTAINER) \ --filter name=$(CONTAINER) \
--format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'" --format 'table {{.Names}}\t{{.Status}}\t{{.Ports}}'"
@ -135,22 +136,22 @@ status: check-ssh
# LOGS # LOGS
# ---------------------------------------------------------- # ----------------------------------------------------------
logs: check-ssh logs: check-ssh
@ssh $(DS_HOST) "sudo docker logs $(CONTAINER) --tail=100" @ssh $(DS_HOST) "$(DOCKER) logs $(CONTAINER) --tail=100"
logs-f: check-ssh logs-f: check-ssh
@ssh $(DS_HOST) "sudo docker logs $(CONTAINER) -f" @ssh $(DS_HOST) "$(DOCKER) logs $(CONTAINER) -f"
# ---------------------------------------------------------- # ----------------------------------------------------------
# SHELL im Container # SHELL im Container
# ---------------------------------------------------------- # ----------------------------------------------------------
shell: check-ssh shell: check-ssh
@ssh -t $(DS_HOST) "sudo docker exec -it $(CONTAINER) bash" @ssh -t $(DS_HOST) "$(DOCKER) exec -it $(CONTAINER) bash"
# ---------------------------------------------------------- # ----------------------------------------------------------
# SQLite # SQLite
# ---------------------------------------------------------- # ----------------------------------------------------------
db: check-ssh db: check-ssh
@ssh -t $(DS_HOST) "sudo docker exec -it $(CONTAINER) \ @ssh -t $(DS_HOST) "$(DOCKER) exec -it $(CONTAINER) \
sqlite3 /data/banyaro.db" sqlite3 /data/banyaro.db"
# ---------------------------------------------------------- # ----------------------------------------------------------

6
scripts/setup-ds.sh
View file

@ -120,8 +120,8 @@ echo "→ Docker build (dauert 2-3 Minuten)..."
ssh "$DS_HOST" " ssh "$DS_HOST" "
cd '${DS_PATH}' && cd '${DS_PATH}' &&
sudo docker compose build && sudo /usr/local/bin/docker compose build &&
sudo docker compose up -d sudo /usr/local/bin/docker compose up -d
" "
ok "Container gestartet" ok "Container gestartet"
@ -133,7 +133,7 @@ echo "→ Warte auf App-Start..."
sleep 5 sleep 5
STATUS=$(ssh "$DS_HOST" \ 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 if echo "$STATUS" | grep -q "Up"; then
ok "Container läuft — ${STATUS}" ok "Container läuft — ${STATUS}"