From 595ff998d554538ca126e22b2ca425db34b623ef Mon Sep 17 00:00:00 2001
From: corpulent <artemgolub@gmail.com>
Date: Tue, 6 Sep 2022 15:21:16 +0300
Subject: [PATCH] fix: backend image fixes

---
 services/backend/Dockerfile                  | 23 +++++++++-----------
 services/backend/configs/supervisor/api.conf |  4 ++--
 services/backend/configs/uwsgi/uwsgi.ini     |  8 +++++--
 services/backend/requirements.txt            |  1 -
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/services/backend/Dockerfile b/services/backend/Dockerfile
index e2a45b0..c29ff26 100644
--- a/services/backend/Dockerfile
+++ b/services/backend/Dockerfile
@@ -13,11 +13,15 @@ RUN apt-get update && \
   postgresql-contrib \
   wget \
   nano \
-  curl \
   lsof \
+  curl \
   supervisor && \
   rm -rf /var/lib/apt/lists/*
 
+RUN wget https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_amd64.deb
+RUN apt install ./kompose_1.26.1_amd64.deb && \
+  rm kompose_1.26.1_amd64.deb
+
 RUN useradd uwsgi && adduser uwsgi root
 RUN useradd supervisor && adduser supervisor root
 
@@ -26,19 +30,12 @@ RUN pip install --upgrade pip && \
   pip install -r ./requirements.txt && \
   rm ./requirements.txt
 
-RUN touch /var/log/backend_out.log && \
-  touch /var/log/django.log
-
-RUN chmod g+w -R /var/log/
-
-EXPOSE 9000 9001
-
 COPY ./services/backend/src ./server
 COPY ./services/backend/configs/supervisor/api.conf /etc/supervisor/conf.d/api.conf
-COPY ./services/backend/configs/uwsgi ./config/uwsgi
+COPY ./services/backend/configs/uwsgi ./configs/uwsgi
+
+EXPOSE 9000 9001
 
-RUN rm -rf /tmp/uwsgi && \
-  mkdir -p /tmp/uwsgi && \
-  ln -s ./config/uwsgi/uwsgi.ini /tmp/uwsgi/
+HEALTHCHECK CMD curl --fail http://localhost:9000/v1 || exit 1 
 
-CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
+CMD ["/usr/local/bin/uwsgi", "--ini", "/home/configs/uwsgi/uwsgi.ini"]
diff --git a/services/backend/configs/supervisor/api.conf b/services/backend/configs/supervisor/api.conf
index 7cd1b64..fe12574 100644
--- a/services/backend/configs/supervisor/api.conf
+++ b/services/backend/configs/supervisor/api.conf
@@ -3,6 +3,6 @@ nodaemon=true
 
 [program:app]
 priority=1
-user = uwsgi
-command = /usr/local/bin/uwsgi --ini /tmp/uwsgi/uwsgi.ini
+user=uwsgi
+command=/usr/local/bin/uwsgi --ini /home/config/uwsgi/uwsgi.ini
 autorestart=false
diff --git a/services/backend/configs/uwsgi/uwsgi.ini b/services/backend/configs/uwsgi/uwsgi.ini
index 40edf1a..6bf4dab 100644
--- a/services/backend/configs/uwsgi/uwsgi.ini
+++ b/services/backend/configs/uwsgi/uwsgi.ini
@@ -1,6 +1,10 @@
 [uwsgi]
 ini = :base
-socket = 0.0.0.0:9000
+
+# use socket option a third-party router (nginx),
+# use http option to set uwsgi to accept incoming 
+# HTTP requests and route them by itself
+http = 0.0.0.0:9000
 
 master = true
 processes = 5
@@ -8,7 +12,7 @@ processes = 5
 
 [base]
 chdir = /home/server
-module = server.wsgi:application
+module = main.wsgi:application
 chmod-socket=666
 uid = uwsgi
 gid = uwsgi
diff --git a/services/backend/requirements.txt b/services/backend/requirements.txt
index 52b8034..45010ad 100644
--- a/services/backend/requirements.txt
+++ b/services/backend/requirements.txt
@@ -1,6 +1,5 @@
 django==4.0.4
 django-cors-headers==3.11.0
-django-axes==5.32.0
 djangorestframework==3.13.1
 djangorestframework-simplejwt==5.1.0
 django-storages==1.13.1