From 4cc6e69e106017f80a568d99125e1e2f3a9f8cf4 Mon Sep 17 00:00:00 2001
From: www <bofh@fet.at>
Date: Tue, 22 Sep 2020 13:07:38 +0000
Subject: [PATCH] fixes for docker

---
 Dockerfile            |  4 ++--
 deployment/nginx.conf |  9 +++++++--
 fet2020/initdb        |  3 +++
 run_container         | 20 +++++++++++++++++---
 runmariadb            | 11 +++++++++++
 5 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100755 fet2020/initdb
 create mode 100755 runmariadb

diff --git a/Dockerfile b/Dockerfile
index da807778..160ed9e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,8 @@ 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
+COPY ./deployment/nginx.conf /etc/nginx/conf.d/fet2020.conf
 
-RUN python manage.py makemigrations && python manage.py makemigrations posts members
+#RUN python manage.py makemigrations && python manage.py makemigrations posts members
 
 
diff --git a/deployment/nginx.conf b/deployment/nginx.conf
index e24ec60e..7fbb3683 100644
--- a/deployment/nginx.conf
+++ b/deployment/nginx.conf
@@ -1,7 +1,12 @@
 server {
-    listen 80;
+    listen 8080;
+    
+    location /assets {
+    	     alias /app/static;
+	     try_files $uri $uri/ =404;
+    }
     location / {
-        include uwsgi_params;
+    	include uwsgi_params;
         uwsgi_pass unix:///tmp/uwsgi.sock;
     }
 }
diff --git a/fet2020/initdb b/fet2020/initdb
new file mode 100755
index 00000000..dfec82f3
--- /dev/null
+++ b/fet2020/initdb
@@ -0,0 +1,3 @@
+#!/bin/sh
+python manage.py makemigrations && python manage.py makemigrations posts members \
+&& python manage.py migrate
\ No newline at end of file
diff --git a/run_container b/run_container
index 3fac4039..d8d4b7cd 100755
--- a/run_container
+++ b/run_container
@@ -1,5 +1,19 @@
-#docker stop bb2
-#docker container rm bb2
+docker stop fetdjango
+docker container rm fetdjango
+docker stop mariadb
+docker container rm mariadb
 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
+docker run --name fetdjango --network fet-net -d -p 8080:8080  \
+       -v /srv/deploy_1/app/fet2020:/app fet2020django
+docker run --name mariadb  \
+       --network fet-net -d -p 3306:3306 \
+       -v mariadb2:/var/lib/mysql \
+#       -e SKIP_INNODB=yes \
+       -e MYSQL_DATABASE=wordpressdb \
+       -e MYSQL_USER=wordpressuser \
+       -e MYSQL_PASSWORD=hguyFt6S95dgfR4ryb \
+       jbergstroem/mariadb-alpine
+       
+docker exec fetdjango ./initdb
+
diff --git a/runmariadb b/runmariadb
new file mode 100755
index 00000000..994bbcf6
--- /dev/null
+++ b/runmariadb
@@ -0,0 +1,11 @@
+docker stop mysql
+docker container rm mysql
+docker volume rm mariadb2
+docker run -d --name mysql -p 3308:3306 \
+       -v mariadb2:/var/lib/mysql \
+       -e SKIP_INNODB=no \
+       -e MYSQL_DATABASE=fet2020db \
+       -e MYSQL_USER=user \
+       -e MYSQL_PASSWORD=hgu \
+       -e MYSQL_ROOT_PASSWORD=hgu \
+       jbergstroem/mariadb-alpine
\ No newline at end of file