diff --git a/compose/bruchtal-webhook/deploy/Dockerfile b/compose/-webhook/deploy/Dockerfile similarity index 100% rename from compose/bruchtal-webhook/deploy/Dockerfile rename to compose/-webhook/deploy/Dockerfile diff --git a/compose/bruchtal-webhook/docker-compose.yml b/compose/-webhook/docker-compose.yml similarity index 79% rename from compose/bruchtal-webhook/docker-compose.yml rename to compose/-webhook/docker-compose.yml index 98b6d44..da9e64f 100644 --- a/compose/bruchtal-webhook/docker-compose.yml +++ b/compose/-webhook/docker-compose.yml @@ -1,13 +1,13 @@ services: bruchtal-webhook: build: ./deploy - container_name: bruchtal-webhook + container_name: webhook restart: unless-stopped ports: - "9001:9001" volumes: - /docker/Bruchtal:/workspace - - /docker/Bruchtal/deploy/hooks.json:/hooks/hooks.json:ro + - /docker/Bruchtal/scripts/webhook-deploy/hooks.json:/hooks/hooks.json:ro - /var/run/docker.sock:/var/run/docker.sock - /root/.ssh:/root/.ssh:ro command: ["-hooks", "/hooks/hooks.json", "-verbose", "-port", "9001", "-ip", "0.0.0.0"] diff --git a/docs/workflows/repo-reparieren.md b/docs/workflows/repo-reparieren.md index bed58f9..5d1f874 100644 --- a/docs/workflows/repo-reparieren.md +++ b/docs/workflows/repo-reparieren.md @@ -1,6 +1,25 @@ # Reparieren des Gitea-Repos ## Ausgangslage: aus Versehen Datei auf Vm editier anstatt in VS Code Problem: das Repo ist auseiander gelaufen. -##Lösungsansatz: +## Voraussetzung: +docker/gitea muss laufen + +## Lösungsansatz: - **Wichtig:** dafür sorgen, dass die "korrekten" Dateien auf dem PC liegen wo VS läuft -- \ No newline at end of file +- auf der lokalen Maschine in Bruchtal: +``` snippet +git push origin main --force +``` + +auf der VM: +``` snippet +cd /docker/Bruchtal + +git fetch origin +git reset --hard origin/main +``` +Optional noch alte Dateien entfernen: +``` +git clean -fd + +``` diff --git a/deploy/deploy-bruchtal.sh b/scripts/webhook-deploy/deploy-bruchtal.sh similarity index 100% rename from deploy/deploy-bruchtal.sh rename to scripts/webhook-deploy/deploy-bruchtal.sh diff --git a/deploy/deploy-bruchtal.sh-sik b/scripts/webhook-deploy/deploy-bruchtal.sh-sik similarity index 100% rename from deploy/deploy-bruchtal.sh-sik rename to scripts/webhook-deploy/deploy-bruchtal.sh-sik diff --git a/deploy/hooks.json b/scripts/webhook-deploy/hooks.json similarity index 100% rename from deploy/hooks.json rename to scripts/webhook-deploy/hooks.json