From c6aaccda6789473158aa98d82db23fc6d8af5485 Mon Sep 17 00:00:00 2001 From: Martin Quarda Date: Thu, 24 Oct 2024 14:06:30 +0200 Subject: [PATCH] fixes --- Dockerfile | 7 +++---- nginx.conf | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b57716e..51a140e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,8 @@ FROM greyltc/archlinux-aur:yay WORKDIR /alkator COPY . . -run pacman -Syu python python-weasyprint python-dateutil python-django npm --noconfirm +RUN pacman -Syu python python-weasyprint python-dateutil python-django npm --noconfirm RUN sudo -u ab -D~ bash -c 'yay -Syu --removemake --needed --noprogressbar --noconfirm python-daphne' RUN cd frontend && npm install && npm run build && rm -rf node_modules && cd .. -RUN python manage.py collectstatic -EXPOSE 8002 -CMD ["/usr/bin/daphne", "alkator.asgi:application", "-p", "8002"] +EXPOSE 8005 +CMD ["/usr/bin/daphne", "alkator.asgi:application", "-p", "8005"] diff --git a/nginx.conf b/nginx.conf index 95aa098..67e1fa3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -50,14 +50,14 @@ http { location /api{ proxy_read_timeout 300; - proxy_pass http://localhost:8002; + proxy_pass http://localhost:8005; } location /api/upload_files{ client_max_body_size 100M; - proxy_pass http://localhost:8002; + proxy_pass http://localhost:8005; } location /admin { - proxy_pass http://localhost:8002; + proxy_pass http://localhost:8005; } location /static { root /alkator;