1
0
Fork 0

Simplify docker configuration

merge-requests/135/head
Nikos Roussos 2017-02-21 17:53:46 +02:00
parent ee19367ad8
commit 9f613ab5c0
No known key found for this signature in database
GPG Key ID: BADFF1767BA7C8E1
5 changed files with 8 additions and 13 deletions

View File

@ -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

View File

@ -19,4 +19,4 @@ web:
- ALLOWED_HOSTS=*
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
command:
./docker/run-compose.sh
./docker/run-docker.sh

View File

@ -1,5 +0,0 @@
#!/bin/bash
find ./staticfiles -mindepth 1 -not -name '.gitkeep'| xargs rm -rf
./manage.py collectstatic --noinput
./manage.py migrate --noinput

View File

@ -1,4 +0,0 @@
#!/bin/sh
./docker/run-common.sh
./manage.py runserver 0.0.0.0:8000

View File

@ -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