From 9f613ab5c0bbd7d6c7b557bf8769962b05b96cb7 Mon Sep 17 00:00:00 2001
From: Nikos Roussos <nikos@roussos.cc>
Date: Tue, 21 Feb 2017 17:53:46 +0200
Subject: [PATCH] Simplify docker configuration

---
 Dockerfile            | 1 +
 docker-compose.yml    | 2 +-
 docker/run-common.sh  | 5 -----
 docker/run-compose.sh | 4 ----
 docker/run-docker.sh  | 9 ++++++---
 5 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100755 docker/run-common.sh
 delete mode 100755 docker/run-compose.sh

diff --git a/Dockerfile b/Dockerfile
index b5ceb81..8fc4eb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ RUN yum -y install python python-pip python-devel git gcc libjpeg-turbo-devel \
                    libxml2-devel libxslt-devel mysql-devel mysql npm
 RUN yum -y clean all
 RUN npm install -g bower
+RUN pip install --upgrade pip
 
 COPY ./requirements/ /tmp/requirements/
 RUN pip install -r /tmp/requirements/docker.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index 3106027..6fc5306 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,4 +19,4 @@ web:
     - ALLOWED_HOSTS=*
     - DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
   command:
-    ./docker/run-compose.sh
+    ./docker/run-docker.sh
diff --git a/docker/run-common.sh b/docker/run-common.sh
deleted file mode 100755
index 18f326f..0000000
--- a/docker/run-common.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-find ./staticfiles -mindepth 1 -not -name '.gitkeep'| xargs rm -rf
-./manage.py collectstatic --noinput
-./manage.py migrate --noinput
diff --git a/docker/run-compose.sh b/docker/run-compose.sh
deleted file mode 100755
index 4199458..0000000
--- a/docker/run-compose.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-./docker/run-common.sh
-./manage.py runserver 0.0.0.0:8000
diff --git a/docker/run-docker.sh b/docker/run-docker.sh
index 7c5bde6..6b648a6 100755
--- a/docker/run-docker.sh
+++ b/docker/run-docker.sh
@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
-./docker/run-common.sh
-gunicorn db.wsgi:application -b 0.0.0.0:80 -w 2 --log-file -
+find ./staticfiles -mindepth 1 -not -name '.gitkeep'| xargs rm -rf
+bower install
+./manage.py collectstatic --noinput
+./manage.py migrate --noinput
+./manage.py runserver 0.0.0.0:8000