From 8bb446df54fceb867ade7d0a7f97cd446163eab6 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 17:31:14 +0000 Subject: [PATCH 01/13] Added frontend runner --- .ci/deploy.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 .ci/deploy.sh diff --git a/.ci/deploy.sh b/.ci/deploy.sh new file mode 100755 index 000000000..67cbe53b7 --- /dev/null +++ b/.ci/deploy.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e + +echo "[CI] Starte Deploy-Prozess für Volleyball CMS..." + +cd .. +cd backend +git pull origin main + +cd ../frontend +git pull origin main + +cd .. +docker-compose down +docker-compose up --build -d + +echo "[CI] ✅ Deployment abgeschlossen!" From b5314a7f3ed923803bebae406a98e7f322ed0f19 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 17:33:54 +0000 Subject: [PATCH 02/13] Added backend as submodule --- .gitmodules | 3 +++ backend | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 backend diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..4f06aca44 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "backend"] + path = backend + url = https://gitea.marc-wieland.de/mrcwlnd/volleyball-dev-backend.git diff --git a/backend b/backend new file mode 160000 index 000000000..2fc2a42f7 --- /dev/null +++ b/backend @@ -0,0 +1 @@ +Subproject commit 2fc2a42f71dcf71cbfff5b9285cb14d424ab5710 From ab4b67f14f99869848b3d4ffaaeeb10b394e4013 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 17:35:22 +0000 Subject: [PATCH 03/13] Added submodule --- .ci/deploy.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 67cbe53b7..4db532ec4 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -3,14 +3,22 @@ set -e echo "[CI] Starte Deploy-Prozess für Volleyball CMS..." -cd .. +# Sicherstellen, dass wir im richtigen Verzeichnis sind +CI_ROOT=$(pwd) +echo "[CI] Arbeitsverzeichnis: $CI_ROOT" + +# Optional: Submodules nochmal aktualisieren (zur Sicherheit) +git submodule update --init --recursive + +echo "[CI] Pull Backend..." cd backend git pull origin main -cd ../frontend +echo "[CI] Pull Frontend..." +cd ../ git pull origin main -cd .. +echo "[CI] Docker Compose Build & Restart..." docker-compose down docker-compose up --build -d From f0f4019eaf6538a9978bdd8d675fb8e315eceb2e Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 2 Jun 2025 17:35:44 +0000 Subject: [PATCH 04/13] .gitea/workflows/deploy.yml aktualisiert --- .gitea/workflows/deploy.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 271cf1718..e1f9ca900 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -7,7 +7,15 @@ on: jobs: deploy: - runs-on: self-hosted + runs-on: ubuntu-latest steps: - - name: Starte zentrales Deploy Script - run: bash ~/tg-cms/deploy.sh + - name: Checkout inklusive Submodules + uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Zeige Verzeichnisstruktur + run: ls -R + + - name: Starte Deploy Script + run: bash .ci/deploy.sh From 024fa8ab754faaffdd01036f63b323815d760cba Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 17:38:04 +0000 Subject: [PATCH 05/13] Fixed build script --- .ci/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 4db532ec4..40213584e 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -19,7 +19,7 @@ cd ../ git pull origin main echo "[CI] Docker Compose Build & Restart..." -docker-compose down -docker-compose up --build -d +docker compose down +docker compose up --build -d echo "[CI] ✅ Deployment abgeschlossen!" From 31a93c06a645d3d7750da975380e8211f152d55a Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 17:39:49 +0000 Subject: [PATCH 06/13] Fixed script --- .ci/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 40213584e..1f1023e85 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -19,6 +19,7 @@ cd ../ git pull origin main echo "[CI] Docker Compose Build & Restart..." +cd .. docker compose down docker compose up --build -d From 4cc0e964aa71c9546381dc64f200eac06ce05290 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 17:42:39 +0000 Subject: [PATCH 07/13] Added docker compose file --- docker-compose.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..aad8952ca --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,45 @@ +version: '3' + +services: + backend: + build: ./backend + ports: + - "3000:3000" + volumes: + - ./backend/uploads:/app/uploads + - ./backend/logs:/app/logs + networks: + - tg-net + restart: always + env_file: + - ./backend/.env + + db: + image: postgres:15 + restart: always + environment: + POSTGRES_USER: tgadmin + POSTGRES_PASSWORD: secretpass + POSTGRES_DB: tg-cms + volumes: + - db-data:/var/lib/postgresql/data + networks: + - tg-net + + frontend: + build: ./frontend + ports: + - "8080:80" + networks: + - tg-net + depends_on: + - backend + restart: always + + + +networks: + tg-net: + +volumes: + db-data: From e9be2cc4917e77171ee3d5027eeea241aa5c6c81 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 2 Jun 2025 22:04:36 +0000 Subject: [PATCH 08/13] .gitea/workflows/deploy.yml aktualisiert --- .gitea/workflows/deploy.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e1f9ca900..fd93eb535 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -14,8 +14,14 @@ jobs: with: submodules: recursive - - name: Zeige Verzeichnisstruktur - run: ls -R + - name: Debug Arbeitsverzeichnis und Dateien + run: | + echo "📂 Aktuelles Arbeitsverzeichnis:" + pwd + echo "📄 Inhalt des Verzeichnisses:" + ls -la + echo "📄 Suche docker-compose.yml:" + find . -name docker-compose.yml - name: Starte Deploy Script run: bash .ci/deploy.sh From 339a806f345350ba1e352b5ff0aa783a16c2c7a1 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 22:06:16 +0000 Subject: [PATCH 09/13] Neues Script --- .ci/deploy.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 1f1023e85..d9aad131d 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -3,11 +3,10 @@ set -e echo "[CI] Starte Deploy-Prozess für Volleyball CMS..." -# Sicherstellen, dass wir im richtigen Verzeichnis sind CI_ROOT=$(pwd) echo "[CI] Arbeitsverzeichnis: $CI_ROOT" -# Optional: Submodules nochmal aktualisieren (zur Sicherheit) +# Submodule laden git submodule update --init --recursive echo "[CI] Pull Backend..." @@ -19,8 +18,7 @@ cd ../ git pull origin main echo "[CI] Docker Compose Build & Restart..." -cd .. -docker compose down -docker compose up --build -d +docker compose -f docker-compose.yml down +docker compose -f docker-compose.yml up --build -d echo "[CI] ✅ Deployment abgeschlossen!" From d4cd206406c21b505aff679747399d427e67602e Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 22:11:40 +0000 Subject: [PATCH 10/13] UIpdated backend --- backend | 2 +- docker-compose.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/backend b/backend index 2fc2a42f7..d9f517690 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 2fc2a42f71dcf71cbfff5b9285cb14d424ab5710 +Subproject commit d9f5176904b72a8d85f879f3d5a115742358fdf5 diff --git a/docker-compose.yml b/docker-compose.yml index aad8952ca..4d0f7854e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: backend: build: ./backend From 0ab629894f2e14e4cf2bf6a2b2651075b0926e28 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 22:13:27 +0000 Subject: [PATCH 11/13] Neues frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d0f7854e..2c4052f42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: - tg-net frontend: - build: ./frontend + build: . ports: - "8080:80" networks: From b39b1116c6aa0f75a69b5e9ab9d15ee7a551b523 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 22:22:42 +0000 Subject: [PATCH 12/13] Docker compose fix --- .ci/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index d9aad131d..dfa896dd1 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -18,6 +18,7 @@ cd ../ git pull origin main echo "[CI] Docker Compose Build & Restart..." +export COMPOSE_PROJECT_NAME=tg-cms docker compose -f docker-compose.yml down docker compose -f docker-compose.yml up --build -d From bf50eb3e70cea42aa02ef76ff168d9c91e5a248a Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 2 Jun 2025 22:29:54 +0000 Subject: [PATCH 13/13] Build script gallery erweiterung --- .ci/deploy.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index dfa896dd1..14f1cd71d 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -17,6 +17,19 @@ echo "[CI] Pull Frontend..." cd ../ git pull origin main +echo "[CI] Kopiere alte Uploads..." +OLD_UPLOADS=~/backend/uploads +NEW_UPLOADS=./backend/uploads + +mkdir -p "$NEW_UPLOADS" +if [ -d "$OLD_UPLOADS" ]; then + cp -ru "$OLD_UPLOADS/"* "$NEW_UPLOADS"/ + echo "[CI] Uploads erfolgreich kopiert." +else + echo "[CI] ⚠️ Kein alter Upload-Ordner gefunden unter $OLD_UPLOADS" +fi + + echo "[CI] Docker Compose Build & Restart..." export COMPOSE_PROJECT_NAME=tg-cms docker compose -f docker-compose.yml down