merged docker-compose

docker-compose.yml

@@ -18,7 +18,6 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=narl"
-      # Ultra-clean rule for maximum Traefik compatibility
       - "traefik.http.routers.holy-energy-backend.priority=100"
       - "traefik.http.routers.holy-energy-backend.rule=Host(`holy.narl.io`) && (PathPrefix(`/api`) || PathPrefix(`/admin`) || PathPrefix(`/static`) || PathPrefix(`/media`))"
       - "traefik.http.routers.holy-energy-backend.entrypoints=websecure"

update_website.sh

@@ -1,6 +1,10 @@
 sudo docker compose down
-git pull origin main
+git stash
+git checkout main
+git pull
+git checkout narl.io
 git merge main
+git stash apply
 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`"