nvrl/holy-flavor-rater
1
0 Fork 0
mirror of https://github.com/narrrl/holy-flavor-rater.git synced 2026-11-03 16:41:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

merged docker-compose

Browse Source
This commit is contained in:
nvrl committed 2026-02-16 19:51:45 +01:00
1 parent e7e6f5cc39
commit 2508d63d1e
2 files changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docker-compose.yml
-1
View File
@@ -18,7 +18,6 @@ services:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=narl" - "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.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.rule=Host(`holy.narl.io`) && (PathPrefix(`/api`) || PathPrefix(`/admin`) || PathPrefix(`/static`) || PathPrefix(`/media`))"
- "traefik.http.routers.holy-energy-backend.entrypoints=websecure" - "traefik.http.routers.holy-energy-backend.entrypoints=websecure"
update_website.sh
+5 -1
View File
@@ -1,6 +1,10 @@
sudo docker compose down sudo docker compose down
git pull origin main git stash
git checkout main
git pull
git checkout narl.io
git merge main git merge main
git stash apply
CONFLICTS=$(git ls-files -u | wc -l) CONFLICTS=$(git ls-files -u | wc -l)
if [ "$CONFLICTS" -gt 0 ] ; then 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`" echo "There are merge conflicts, resolve them and run `sudo docker compose up -d --build` or abort with `git merge --abort`"