Merge /srv/deploy_1/app

.gitignore

@@ -9,3 +9,4 @@ fet2020/*/migrations/*
 .flake8
 migrate
 run
+*.pid

Dockerfile

@@ -4,7 +4,8 @@ RUN python -m venv /opt/venv
 # Make sure we use the virtualenv:
 ENV PATH="/opt/venv/bin:$PATH"
 
-RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers musl-dev jpeg-dev zlib-dev libffi-dev \ 
+RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers \
+    	    musl-dev jpeg-dev zlib-dev libffi-dev \ 
 	    && pip install --upgrade pip 
 
 COPY ./fet2020/requirements.txt /app/requirements.txt
@@ -20,6 +21,7 @@ COPY --from=builder /opt/venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 COPY ./fet2020 /app
+COPY ./deployment/nginx.conf /etc/nginx/conf.d/nginx.conf
 
 RUN python manage.py makemigrations && python manage.py makemigrations posts members
 

deployment/nginx.conf

@@ -0,0 +1,7 @@
+server {
+    listen 80;
+    location / {
+        include uwsgi_params;
+        uwsgi_pass unix:///tmp/uwsgi.sock;
+    }
+}

run_container

@@ -1,4 +1,5 @@
-docker stop bb2
-docker container rm bb2
-docker build -t test1 .
-docker run --name bb2 -d -p 8080:80 test1
+#docker stop bb2
+#docker container rm bb2
+docker build -t fet2020django .
+docker network create fet-net
+docker run --name fetdjango --network fet-net -d -p 8080:80 -v /srv/deploy_1/app/fet2020:/app fet2020django