diff --git a/deploy/deploy-bruchtal.sh b/deploy/deploy-bruchtal.sh index cf4e37e..2b964b2 100755 --- a/deploy/deploy-bruchtal.sh +++ b/deploy/deploy-bruchtal.sh @@ -1,25 +1,48 @@ #!/bin/sh set -e # test XDG_RUNTIME_DIR - + +LOGFILE="/var/log/bruchtal-deploy.log" cd /workspace -echo "==> Pulling latest changes" -git pull +log() { + echo "$(date '+%Y-%m-%d %H:%M:%S') | $*" | tee -a "$LOGFILE" +} -echo "==> Checking for new or modified Markdown files" -# A = Added, M = Modified -changed=$(git diff --name-status HEAD~1 HEAD | grep -E '^[AM]\s.*(\.md$|mkdocs\.yml$)' | awk '{print $2}' || true) - - -if [ -n "$changed" ]; then - echo "Markdown changes detected:" - echo "$changed" - echo "==> Restarting bruchtal-docs container" - cd /workspace - docker restart bruchtal-docs +# ----------------------------- +# 1️⃣ VM-Repo sauber halten +# ----------------------------- +log "Checking for local changes on VM..." +if [ -n "$(git status --porcelain)" ]; then + log "⚠️ Warning: Local changes on VM will be lost!" + git reset --hard + git clean -fd + log "Local changes discarded." else - echo "No Markdown changes detected. Skipping restart." + log "VM repo is clean, no local changes to discard." fi -echo "==> Deploy finished" +# ----------------------------- +# 2️⃣ Pull latest changes +# ----------------------------- +log "Pulling latest changes from Gitea" +git pull + +# ----------------------------- +# 3️⃣ Check for Markdown changes +# ----------------------------- +log "Checking for new or modified Markdown files..." +changed=$(git diff --name-status HEAD~1 HEAD | grep -E '^[AM]\s.*(\.md$|mkdocs\.yml$)' | awk '{print $2}' || true) + +if [ -n "$changed" ]; then + log "Markdown changes detected:" + for f in $changed; do + log " - $f" + done + log "Restarting bruchtal-docs container..." + docker restart bruchtal-docs +else + log "No Markdown changes detected. Skipping restart." +fi + +log "Deploy finished." \ No newline at end of file diff --git a/deploy/deploy-bruchtal.sh-sik b/deploy/deploy-bruchtal.sh-sik new file mode 100755 index 0000000..cf4e37e --- /dev/null +++ b/deploy/deploy-bruchtal.sh-sik @@ -0,0 +1,25 @@ +#!/bin/sh +set -e +# test XDG_RUNTIME_DIR + +cd /workspace + +echo "==> Pulling latest changes" +git pull + +echo "==> Checking for new or modified Markdown files" +# A = Added, M = Modified +changed=$(git diff --name-status HEAD~1 HEAD | grep -E '^[AM]\s.*(\.md$|mkdocs\.yml$)' | awk '{print $2}' || true) + + +if [ -n "$changed" ]; then + echo "Markdown changes detected:" + echo "$changed" + echo "==> Restarting bruchtal-docs container" + cd /workspace + docker restart bruchtal-docs +else + echo "No Markdown changes detected. Skipping restart." +fi + +echo "==> Deploy finished" diff --git a/docs/workflows/repo-reparieren.md b/docs/workflows/repo-reparieren.md new file mode 100644 index 0000000..bed58f9 --- /dev/null +++ b/docs/workflows/repo-reparieren.md @@ -0,0 +1,6 @@ +# Reparieren des Gitea-Repos +## Ausgangslage: aus Versehen Datei auf Vm editier anstatt in VS Code +Problem: das Repo ist auseiander gelaufen. +##Lösungsansatz: +- **Wichtig:** dafür sorgen, dass die "korrekten" Dateien auf dem PC liegen wo VS läuft +- \ No newline at end of file