From 1a0eb070319f61412e4493891ce24f3532cc84b3 Mon Sep 17 00:00:00 2001 From: greg Date: Wed, 5 Feb 2025 16:18:14 +0100 Subject: [PATCH] add gunicorn + update modules --- .gitignore | 4 +-- Dockerfile | 25 ++++++++++++++- .../app/__pycache__/settings.cpython-311.pyc | Bin 3049 -> 3048 bytes quiz-app/app/__pycache__/urls.cpython-311.pyc | Bin 587 -> 586 bytes quiz-app/app/__pycache__/wsgi.cpython-311.pyc | Bin 442 -> 441 bytes .../essay/__pycache__/models.cpython-311.pyc | Bin 1904 -> 1903 bytes .../__pycache__/models.cpython-311.pyc | Bin 4925 -> 4924 bytes .../quiz/__pycache__/admin.cpython-311.pyc | Bin 6313 -> 6312 bytes .../quiz/__pycache__/forms.cpython-311.pyc | Bin 2093 -> 2092 bytes .../quiz/__pycache__/models.cpython-311.pyc | Bin 31926 -> 31925 bytes .../quiz/__pycache__/urls.cpython-311.pyc | Bin 1817 -> 1816 bytes .../quiz/__pycache__/views.cpython-311.pyc | Bin 23391 -> 23394 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 181 -> 180 bytes .../__pycache__/quiz_tags.cpython-311.pyc | Bin 1289 -> 1288 bytes quiz-app/requirements.txt | 29 +++++++++++++----- .../__pycache__/models.cpython-311.pyc | Bin 2440 -> 2439 bytes requirements.txt | 0 17 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index d3cff13..561da87 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -db.sqlite3 +quiz-app/db.sqlite3 Pipfile Pipfile.lock essay/__pycache__ @@ -9,4 +9,4 @@ true_false/__pycache__ true_false/__init__.py multichoice/__pycache__ multichoice/__init__.py -venv \ No newline at end of file +quiz-venv \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e59ac01..5067984 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,27 @@ WORKDIR /code COPY quiz-app/requirements.txt /code/ RUN pip install -r requirements.txt COPY quiz-app/. /code/ -CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] \ No newline at end of file +CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] + +# BUILD +FROM python:3.11-slim-bookworm AS builder + +WORKDIR /app + +RUN apt-get update && apt-get install -y \ + gcc \ + && rm -rf /var/lib/apt/lists/* + +COPY quiz-app/requirements.txt . +RUN pip install --no-cache-dir --prefix=/install -r requirements.txt + +# FINAL +FROM python:3.11-slim-bookworm + +WORKDIR /code + +COPY --from=builder /install /usr/local +COPY quiz-app/. . + +EXPOSE 8000 +CMD ["gunicorn", "-b", "0.0.0.0:8000", "app.wsgi:application"] diff --git a/quiz-app/app/__pycache__/settings.cpython-311.pyc b/quiz-app/app/__pycache__/settings.cpython-311.pyc index 1d52b501394c76e90b2106f155339073d391d57d..2a147a483b50484f7f96f4a5d44be543c0bd31dd 100644 GIT binary patch delta 48 zcmaDU{z9B*IWI340}yysFHYacvw~C9Qa>X) delta 49 zcmdm^wpWd3IWI340}$Bl5l-94vy55HK|douH&s8qC^cQbJijQrxF9h()nxN==2CtD DWQ`B2 diff --git a/quiz-app/quiz/__pycache__/admin.cpython-311.pyc b/quiz-app/quiz/__pycache__/admin.cpython-311.pyc index efa8d358b4699e6af4c2c4c457dfed73fd7fe17c..c3e5b3a54975fbad79da83b46f0126480861c143 100644 GIT binary patch delta 48 zcmZ2!xWbTUIWI340}yysFHYacGm%BqTt6c}H&s8qC^cQbJijQrxF9h(b@OJHZ^8gu Co)8rP delta 49 zcmZ2sxYCekIWI340}$Bl5l-94Gm%BiLO&xvH&s8qC^cQbJijQrxF9h()nxM~mT$rU DUYif@ diff --git a/quiz-app/quiz/__pycache__/forms.cpython-311.pyc b/quiz-app/quiz/__pycache__/forms.cpython-311.pyc index ed004b7ff5ced7c101f731d49429cc0f0d57ae7e..4f80a3731c0f3f3bc99e410616f6d07b1f34b0ca 100644 GIT binary patch delta 48 zcmZ20uttDqIWI340}yysFHYacqroIjr=`kw+ DMVAh} diff --git a/quiz-app/quiz/__pycache__/models.cpython-311.pyc b/quiz-app/quiz/__pycache__/models.cpython-311.pyc index 659dbca0052eaa4c589694503eb7e1b90ad8ad08..f5c62dec4b923c703dce5424e333bf321c339261 100644 GIT binary patch delta 50 zcmdn?lX2@$MxN!oyj%=G;8ndieIw5?7EufRjQreG{q&;Lbp7)DqU_>=#N^b?FIdi% F0|2zL5@-Mb delta 51 zcmdn`lX2TmMxN!oyj%=GV7Es&Z6nVy7BNfxjQreG{q&;Lbp7)DqU_>=#N-2|kP<-v diff --git a/quiz-app/quiz/__pycache__/urls.cpython-311.pyc b/quiz-app/quiz/__pycache__/urls.cpython-311.pyc index 89266cd4e142e5ab6ce858105b781703ee907fad..2593a695660148bc5e427183e017b8b0fd40b8e7 100644 GIT binary patch delta 48 zcmbQqH-nF7IWI340}yysFHYacGmAykOg|$(H&s8qC^cQbJijQrxF9h(b@LvUSSA2S C_74^S delta 49 zcmbQiHSGNMt*LpetJ=Ax_)_nQFd`bVsh%{D3)?J n_7r9YhIaPplMnc+Z2sfr%E+3{1k}0N$!94GW7p;v0p(l(lmr`m delta 72 zcmaE~jq(0AMxN!oyj%=GV7Es&Z6l8bifqv8&dbZi00dsui_g3{C&dbZi00ee>gwr=2.2.9 -django-admin -django-model-utils>=3.1.1 -Pillow>=4.0.0 -psycopg2-binary -six -environs +asgiref==3.8.1 +Django==5.1.6 +django-admin==2.0.2 +django-excel-response2==3.0.6 +django-model-utils==5.0.0 +django-six==1.0.5 +environs==14.1.0 +excel-base==1.0.4 +gunicorn==23.0.0 +isoweek==1.3.3 +marshmallow==3.26.1 +packaging==24.2 +pillow==11.1.0 +psycopg2-binary==2.9.10 +python-dateutil==2.9.0.post0 +python-dotenv==1.0.1 +screen==1.0.1 +six==1.17.0 +sqlparse==0.5.3 +TimeConvert==3.0.13 +tzlocal==5.2 whitenoise==6.6.0 +xlwt==1.3.0 diff --git a/quiz-app/true_false/__pycache__/models.cpython-311.pyc b/quiz-app/true_false/__pycache__/models.cpython-311.pyc index ffb5d7fa16e05afc2510e0e1b70d7e4147c4578a..61f2269875185ec89d0a6e3b36a980a3e5552cc3 100644 GIT binary patch delta 48 zcmeAWZWrcR&dbZi00dsui_gwr