From c52dff2c1037fe553cbbeda96f9ffb28637070be Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 30 May 2023 03:56:46 +0000 Subject: [PATCH] Rename celery.py to pr_celery => causing conflict in names --- datacenterlight/tasks.py | 2 +- dynamicweb/{celery.py => pr_celery.py} | 0 entrypoint.sh | 15 +++++++++++++++ utils/tasks.py | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) rename dynamicweb/{celery.py => pr_celery.py} (100%) create mode 100644 entrypoint.sh diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py index 899b506f..c9613ee8 100644 --- a/datacenterlight/tasks.py +++ b/datacenterlight/tasks.py @@ -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 diff --git a/dynamicweb/celery.py b/dynamicweb/pr_celery.py similarity index 100% rename from dynamicweb/celery.py rename to dynamicweb/pr_celery.py diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 00000000..f546bbea --- /dev/null +++ b/entrypoint.sh @@ -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 diff --git a/utils/tasks.py b/utils/tasks.py index 23deac51..2ae86916 100644 --- a/utils/tasks.py +++ b/utils/tasks.py @@ -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__)