From 2f879662709ca67f6ea47c9e1811b7efc3301f2c Mon Sep 17 00:00:00 2001 From: icurfer Date: Tue, 22 Apr 2025 21:08:08 +0900 Subject: [PATCH] resecntly --- .gitignore | 1 + Dockerfile | 33 ++++++++++++++++++++++++++ Dockerfile_default | 34 +++++++++++++++++++++++++++ README.md | 2 ++ auth_prj/settings.py | 4 ++++ requirementes.txt => requirements.txt | 1 + 6 files changed, 75 insertions(+) create mode 100644 Dockerfile create mode 100644 Dockerfile_default rename requirementes.txt => requirements.txt (96%) diff --git a/.gitignore b/.gitignore index a270eaa..b2ac66d 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,4 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ _media/cluster/ +wheelhouse diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ccf40cd --- /dev/null +++ b/Dockerfile @@ -0,0 +1,33 @@ +# pull official base image +FROM python:3.10-slim-buster + +# set work directory +WORKDIR /usr/src/app + +# set environment variable +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + +# copy project files +COPY . /usr/src/app/ + +# install system dependencies +RUN apt-get update +#RUN apt-get install -y gcc pkg-config default-libmysqlclient-dev python-dev vim systemd +RUN apt-get install -y gcc pkg-config default-libmysqlclient-dev python-dev +RUN apt-get clean + +# install python dependencies +RUN pip install --upgrade pip +RUN pip install -r requirements.txt + +# collect static files +# RUN python manage.py collectstatic --noinput + +# expose the port +EXPOSE 8000 + +# command to run +CMD ["gunicorn", "--workers=3", "--bind=0.0.0.0:8000", "auth_prj.wsgi:application"] + + diff --git a/Dockerfile_default b/Dockerfile_default new file mode 100644 index 0000000..c8e0ae8 --- /dev/null +++ b/Dockerfile_default @@ -0,0 +1,34 @@ +# pull official base image +FROM python:3.8-slim-buster + +# set work directory +WORKDIR /usr/src/app + +# set environment variables +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + +# copy requirements and wheelhouse first (for caching) +COPY requirements.txt . +COPY wheelhouse/ ./wheelhouse/ + +# install system dependencies +RUN apt-get update && \ + apt-get install -y gcc pkg-config default-libmysqlclient-dev python3-dev vim systemd && \ + apt-get clean + +# install Python dependencies from .whl +RUN pip install --upgrade pip && \ + pip install --no-index --find-links=wheelhouse -r requirements.txt + +# copy actual project source code +COPY . /usr/src/app/ + +# collect static files +RUN python manage.py collectstatic --noinput + +# expose the port +EXPOSE 8000 + +# run using gunicorn +CMD ["gunicorn", "--workers=3", "--bind=0.0.0.0:8000", "drf_prj.wsgi:application"] diff --git a/README.md b/README.md index c123691..7ad5fcd 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # msa-django-auth +mkdir -p wheelhouse +pip download -r requirements.txt -d wheelhouse/ diff --git a/auth_prj/settings.py b/auth_prj/settings.py index d403a03..5756a58 100644 --- a/auth_prj/settings.py +++ b/auth_prj/settings.py @@ -77,8 +77,12 @@ CORS_ALLOWED_ORIGINS = [ "http://192.168.0.100:3000", "https://demo.test", "http://demo.test", + "https://www.demo.test", "https://sample.test", "http://sample.test", + "http://www.sample.test", + "http://auth.sample.test", + "http://blog.sample.test", ] # by.sdjo 2025-04-22 diff --git a/requirementes.txt b/requirements.txt similarity index 96% rename from requirementes.txt rename to requirements.txt index 2427f37..d405038 100644 --- a/requirementes.txt +++ b/requirements.txt @@ -24,3 +24,4 @@ sqlparse==0.5.3 typing_extensions==4.13.2 uritemplate==4.1.1 urllib3==2.4.0 +gunicorn==20.1.0 \ No newline at end of file