diff --git a/docker-compose.yml b/docker-compose.yml index f7a69ec..b442c2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ -version: '3.8' - services: + # --- Backend Service --- backend: build: context: ./backend @@ -25,6 +24,7 @@ services: - "traefik.http.routers.holy-backend.tls.certresolver=https_resolver" - "traefik.http.services.holy-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