WIP: Docker updates #13

Draft
mravi wants to merge 19 commits from docker into master
4 changed files with 17 additions and 2 deletions
Showing only changes of commit c52dff2c10 - Show all commits

View file

@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
from dynamicweb.celery import app
from dynamicweb.pr_celery import app
from hosting.models import HostingOrder
from membership.models import CustomUser
from opennebula_api.models import OpenNebulaManager

15
entrypoint.sh Normal file
View file

@ -0,0 +1,15 @@
#!/bin/sh
# Wait for the database to be available
while ! nc -z db 5432; do
sleep 0.1
done
# Apply database migrations
python manage.py migrate
# Collect static files
python manage.py collectstatic --no-input
# Start the server
python manage.py runserver 0.0.0.0:8000

View file

@ -8,7 +8,7 @@ from celery.utils.log import get_task_logger
from django.conf import settings
from django.core.mail import EmailMessage
from dynamicweb.celery import app
from dynamicweb.pr_celery import app
logger = get_task_logger(__name__)