diff --git a/backend/media/avatars/PXL_20251117_125741645.RAW-01.COVER.jpg b/backend/media/avatars/PXL_20251117_125741645.RAW-01.COVER.jpg new file mode 100644 index 0000000..5c88966 Binary files /dev/null and b/backend/media/avatars/PXL_20251117_125741645.RAW-01.COVER.jpg differ diff --git a/docker-compose.yml b/docker-compose.yml index 371ca96..9cf7619 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: # --- Backend Service (Gunicorn + WhiteNoise) --- backend: @@ -11,7 +9,7 @@ services: - narl - internal env_file: - - .env.narl.io + - .env volumes: - ./backend:/app - ./legacy:/app/legacy @@ -43,7 +41,7 @@ services: networks: - narl env_file: - - .env.narl.io + - .env depends_on: - backend labels: @@ -64,3 +62,4 @@ networks: volumes: db_data: + 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