merged

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

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