From a49fb5e8852029283168bd06f0699456730cf950 Mon Sep 17 00:00:00 2001 From: Pablo Moreno Date: Mon, 13 May 2024 14:20:37 +0200 Subject: [PATCH] fix: Dockerfile --- Dockerfile | 11 +++++------ config/settings/base.py | 1 - frontend/__init__.py | 0 frontend/admin.py | 3 --- frontend/apps.py | 6 ------ frontend/migrations/__init__.py | 0 frontend/models.py | 3 --- frontend/templates/base/base.html | 21 --------------------- frontend/tests.py | 3 --- frontend/views.py | 3 --- scripts/run.sh | 2 +- 11 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 frontend/__init__.py delete mode 100644 frontend/admin.py delete mode 100644 frontend/apps.py delete mode 100644 frontend/migrations/__init__.py delete mode 100644 frontend/models.py delete mode 100644 frontend/templates/base/base.html delete mode 100644 frontend/tests.py delete mode 100644 frontend/views.py diff --git a/Dockerfile b/Dockerfile index 211568d..0e97577 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-alpine +FROM python:3.12-slim ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 @@ -8,11 +8,10 @@ RUN mkdir /code WORKDIR /code COPY requirements.txt /code -RUN apk update && \ - apk add gcc vim postgresql-client openrc nginx && \ - apk del gcc && \ - openrc && \ - touch /run/openrc/softlevel && \ +RUN apt-get update \ + && apt-get install -y build-essential gcc git nginx gettext vim python3-dev libpq-dev \ + && apt-get purge -y build-essential \ + && apt-get autoremove -y && \ pip install -r requirements.txt COPY . /code diff --git a/config/settings/base.py b/config/settings/base.py index 1c27093..82bdd88 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -28,7 +28,6 @@ THIRD_PARTY_APPS = [ PROJECT_APPS = [ "files", - "frontend", "shop", "tpv", "users", diff --git a/frontend/__init__.py b/frontend/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/admin.py b/frontend/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/frontend/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/frontend/apps.py b/frontend/apps.py deleted file mode 100644 index c626efa..0000000 --- a/frontend/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class FrontendConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "frontend" diff --git a/frontend/migrations/__init__.py b/frontend/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/models.py b/frontend/models.py deleted file mode 100644 index 71a8362..0000000 --- a/frontend/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/frontend/templates/base/base.html b/frontend/templates/base/base.html deleted file mode 100644 index 69aaf88..0000000 --- a/frontend/templates/base/base.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {{ title }} - - - - - - - - {% block content %}{% endblock %} - - diff --git a/frontend/tests.py b/frontend/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/frontend/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/frontend/views.py b/frontend/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/frontend/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/scripts/run.sh b/scripts/run.sh index a74cfe0..829b0ca 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -10,7 +10,7 @@ RUN_CELERY=${RUN_CELERY:="FALSE"} if [ $RUN_SERVER = "TRUE" ]; then - rc-service nginx start + service nginx start uvicorn --workers $ASGI_WORKERS --host $ASGI_HOST --port $ASGI_PORT config.asgi:application elif [ $RUN_CELERY = "TRUE" ]; then service nginx stop