From 4562a689bbf3f6dcb57fedf1fc45681b92f27114 Mon Sep 17 00:00:00 2001
From: Nils Pukropp <nils@narl.io>
Date: Mon, 16 Feb 2026 15:11:22 +0100
Subject: [PATCH] merged

---
 docker-compose.yml |  2 ++
 update_website.sh  | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100755 update_website.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 5c7dba2..f278212 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,5 @@
 services:
+  # --- Backend Service ---
   backend:
     build:
       context: ./backend
@@ -24,6 +25,7 @@ services:
       - "traefik.http.routers.holy-energy-backend.tls.certresolver=https_resolver"
       - "traefik.http.services.holy-energy-backend.loadbalancer.server.port=8000"
 
+  # --- Frontend Service ---
   frontend:
     build:
       context: ./frontend
diff --git a/update_website.sh b/update_website.sh
new file mode 100755
index 0000000..c1d33e7
--- /dev/null
+++ b/update_website.sh
@@ -0,0 +1,10 @@
+sudo docker compose down
+git pull origin main
+git merge main
+CONFLICTS=$(git ls-files -u | wc -l)
+if [ "$CONFLICTS" -gt 0 ] ; then
+   echo "There are merge conflicts, resolve them and run `sudo docker compose up -d --build` or abort with `git merge --abort`"
+   exit -1
+fi
+
+sudo docker compose up -d --build