From 72609172082086971693732703c73073261b27e4 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Tue, 25 Apr 2017 21:59:55 +0200
Subject: [PATCH] [WarpInfra] fixed Entrypoints for not Migrating

---
 www/misc/entrypoint.sh     | 4 +---
 www/misc/entrypoint_dev.sh | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/www/misc/entrypoint.sh b/www/misc/entrypoint.sh
index df73104..d42a467 100644
--- a/www/misc/entrypoint.sh
+++ b/www/misc/entrypoint.sh
@@ -2,8 +2,6 @@
 #service rsyslog restart
 
 cd /opt/warpinfra;
-python3 manage.py makemigrations --merge
-python3 manage.py makemigrations
 python3 manage.py migrate
 python3 manage.py compilemessages
 python3 manage.py collectstatic --noinput
@@ -11,4 +9,4 @@ python3 manage.py collectstatic --noinput
 cp -r /opt/warpinfra/static /opt/socket/
 uwsgi --ini /opt/nginx/uwsgi.ini --py-autoreload 1
 
-tail -f /var/log/uwsgi.log
\ No newline at end of file
+tail -f /var/log/uwsgi.log
diff --git a/www/misc/entrypoint_dev.sh b/www/misc/entrypoint_dev.sh
index bb71bf3..5df7dfe 100644
--- a/www/misc/entrypoint_dev.sh
+++ b/www/misc/entrypoint_dev.sh
@@ -2,9 +2,8 @@
 #service rsyslog restart
 
 cd /opt/warpinfra;
-python3 manage.py makemigrations --merge
-python3 manage.py makemigrations
 python3 manage.py migrate
 python3 manage.py compilemessages
 python3 manage.py collectstatic --noinput
 python3 manage.py runserver 0.0.0.0:80
+
-- 
GitLab