From c6a22b91fc37fcc7a50fb5776e0e7ca10bd88713 Mon Sep 17 00:00:00 2001
From: "root (lxc-fetsite-04)" <admin@fet.at>
Date: Wed, 16 Sep 2020 19:03:27 +0200
Subject: [PATCH 1/2] small fix to docker

---
 Dockerfile    | 7 ++++---
 run_container | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0b775793..da2dd0db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,9 @@ 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 \ 
-&& pip install --upgrade pip 
+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
 
@@ -19,7 +20,7 @@ COPY --from=builder /opt/venv /opt/venv
 # Make sure we use the virtualenv:
 ENV PATH="/opt/venv/bin:$PATH"
 
-COPY ./fet2020 /app
+#COPY ./fet2020 /app
 
 RUN python manage.py makemigrations && python manage.py makemigrations posts members
 
diff --git a/run_container b/run_container
index d6846bc8..9f8dd29e 100755
--- a/run_container
+++ b/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 network create fet-net
+docker run --name fetdjango --network fet-net -d -p 8080:80 test1

From e687621e4017b377561a5dec890526ba055595ac Mon Sep 17 00:00:00 2001
From: "root (lxc-fetsite-04)" <admin@fet.at>
Date: Wed, 16 Sep 2020 19:49:43 +0200
Subject: [PATCH 2/2] multiple fixes Dockerfile

---
 .gitignore            | 3 ++-
 Dockerfile            | 3 ++-
 deployment/nginx.conf | 7 +++++++
 run_container         | 8 ++++----
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 deployment/nginx.conf

diff --git a/.gitignore b/.gitignore
index d1b92082..a42a8dbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ fet2020/*/migrations/*
 .theia/*
 .flake8
 migrate
-run
\ No newline at end of file
+run
+*.pid
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index da2dd0db..da807778 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,8 @@ COPY --from=builder /opt/venv /opt/venv
 # Make sure we use the virtualenv:
 ENV PATH="/opt/venv/bin:$PATH"
 
-#COPY ./fet2020 /app
+COPY ./fet2020 /app
+COPY ./deployment/nginx.conf /etc/nginx/conf.d/nginx.conf
 
 RUN python manage.py makemigrations && python manage.py makemigrations posts members
 
diff --git a/deployment/nginx.conf b/deployment/nginx.conf
new file mode 100644
index 00000000..e24ec60e
--- /dev/null
+++ b/deployment/nginx.conf
@@ -0,0 +1,7 @@
+server {
+    listen 80;
+    location / {
+        include uwsgi_params;
+        uwsgi_pass unix:///tmp/uwsgi.sock;
+    }
+}
diff --git a/run_container b/run_container
index 9f8dd29e..3fac4039 100755
--- a/run_container
+++ b/run_container
@@ -1,5 +1,5 @@
-docker stop bb2
-docker container rm bb2
-docker build -t 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 test1
+docker run --name fetdjango --network fet-net -d -p 8080:80 -v /srv/deploy_1/app/fet2020:/app fet2020django