diff --git a/docker/django/Dockerfile b/docker/Dockerfile similarity index 92% rename from docker/django/Dockerfile rename to docker/Dockerfile index 58fa5e5..aaeaaa0 100644 --- a/docker/django/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,6 @@ RUN --mount=type=cache,target=/tmp/pip_cache \ # Runtime stage for copying code and scripts FROM base AS runtime COPY --from=builder /usr/local/lib /usr/local/lib -COPY docker/entrypoint.sh ./ +COPY docker/entrypoint.sh docker/uwsgi.ini ./ COPY orebolt_prevoid/ ./ ENTRYPOINT ["entrypoint.sh"] \ No newline at end of file diff --git a/docker/django/entrypoint.sh b/docker/entrypoint.sh similarity index 91% rename from docker/django/entrypoint.sh rename to docker/entrypoint.sh index ec20fdf..d5bca7c 100644 --- a/docker/django/entrypoint.sh +++ b/docker/entrypoint.sh @@ -2,7 +2,7 @@ # Based on env variable PREVOID_RUN_MODE decide which service to start if [ "$PREVOID_RUN_MODE" == "DJANGO" ] - python3 /app/manage.py runserver 0.0.0.0:8000 + uwsgi --ini /app/uwsgi.ini elif ["$PREVOID_RUN_MODE" == "CELERY"] celery -A /app/orebolt_prevoid worker --loglevel=info diff --git a/docker/uwsgi.ini b/docker/uwsgi.ini new file mode 100644 index 0000000..bd3453d --- /dev/null +++ b/docker/uwsgi.ini @@ -0,0 +1,7 @@ +[uwsgi] +chdir=/app/orebolt_prevoid +module=orebolt_prevoid.wsgi:application +master=True +pidfile=/tmp/orebolt_prevoid.pid +vacuum=True +max-requests=5000 \ No newline at end of file diff --git a/orebolt_prevoid/manage.py b/orebolt_prevoid/manage.py new file mode 100755 index 0000000..ade7d92 --- /dev/null +++ b/orebolt_prevoid/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'orebolt_prevoid.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/manage.py b/orebolt_prevoid/orebolt_prevoid/__init__.py similarity index 100% rename from manage.py rename to orebolt_prevoid/orebolt_prevoid/__init__.py diff --git a/orebolt_prevoid/orebolt_prevoid/asgi.py b/orebolt_prevoid/orebolt_prevoid/asgi.py new file mode 100644 index 0000000..ea68652 --- /dev/null +++ b/orebolt_prevoid/orebolt_prevoid/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for orebolt_prevoid project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'orebolt_prevoid.settings') + +application = get_asgi_application() diff --git a/orebolt_prevoid/orebolt_prevoid/settings.py b/orebolt_prevoid/orebolt_prevoid/settings.py new file mode 100644 index 0000000..42e74a3 --- /dev/null +++ b/orebolt_prevoid/orebolt_prevoid/settings.py @@ -0,0 +1,123 @@ +""" +Django settings for orebolt_prevoid project. + +Generated by 'django-admin startproject' using Django 5.1.2. + +For more information on this file, see +https://docs.djangoproject.com/en/5.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/5.1/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-uz4!gu70j1*6)(qs)+)ekdzjc23q5)jqr91d!#91fie*_unc$n' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'orebolt_prevoid.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'orebolt_prevoid.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/5.1/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/5.1/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/5.1/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/orebolt_prevoid/orebolt_prevoid/urls.py b/orebolt_prevoid/orebolt_prevoid/urls.py new file mode 100644 index 0000000..929a085 --- /dev/null +++ b/orebolt_prevoid/orebolt_prevoid/urls.py @@ -0,0 +1,22 @@ +""" +URL configuration for orebolt_prevoid project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/5.1/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/orebolt_prevoid/orebolt_prevoid/wsgi.py b/orebolt_prevoid/orebolt_prevoid/wsgi.py new file mode 100644 index 0000000..5a27c50 --- /dev/null +++ b/orebolt_prevoid/orebolt_prevoid/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for orebolt_prevoid project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'orebolt_prevoid.settings') + +application = get_wsgi_application() diff --git a/orebolt_prevoid/tasks/bereal.py b/orebolt_prevoid/tasks/bereal.py deleted file mode 100644 index e69de29..0000000 diff --git a/orebolt_prevoid/main.py b/orebolt_prevoid/worker_ui/__init__.py similarity index 100% rename from orebolt_prevoid/main.py rename to orebolt_prevoid/worker_ui/__init__.py diff --git a/orebolt_prevoid/worker_ui/admin.py b/orebolt_prevoid/worker_ui/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/orebolt_prevoid/worker_ui/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/orebolt_prevoid/worker_ui/apps.py b/orebolt_prevoid/worker_ui/apps.py new file mode 100644 index 0000000..71e811b --- /dev/null +++ b/orebolt_prevoid/worker_ui/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class WorkerUiConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'worker_ui' diff --git a/orebolt_prevoid/settings.py b/orebolt_prevoid/worker_ui/migrations/__init__.py similarity index 100% rename from orebolt_prevoid/settings.py rename to orebolt_prevoid/worker_ui/migrations/__init__.py diff --git a/orebolt_prevoid/worker_ui/models.py b/orebolt_prevoid/worker_ui/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/orebolt_prevoid/worker_ui/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/orebolt_prevoid/worker_ui/tests.py b/orebolt_prevoid/worker_ui/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/orebolt_prevoid/worker_ui/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/orebolt_prevoid/worker_ui/views.py b/orebolt_prevoid/worker_ui/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/orebolt_prevoid/worker_ui/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/requirements.txt b/requirements.txt index da7f317..717ab30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ # Django deps - +django>=5.1.2 +uwsgi>=2.0.27 # Celery deps \ No newline at end of file