diff --git a/docker/gunicorn/Dockerfile b/docker/gunicorn/Dockerfile index fd23d36..c53a8aa 100644 --- a/docker/gunicorn/Dockerfile +++ b/docker/gunicorn/Dockerfile @@ -27,11 +27,11 @@ RUN ln -s /usr/local/bin/python3.12.4 /usr/local/bin/python3 ENV PYTHONUNBUFFERED 1 -# create links to pip3.11 -RUN ln -s /usr/local/bin/pip3.11 /usr/bin/pip -RUN ln -s /usr/local/bin/pip3.11 /usr/bin/pip3 -RUN ln -s /usr/local/bin/pip3.11 /usr/local/bin/pip -RUN ln -s /usr/local/bin/pip3.11 /usr/local/bin/pip3 +# create links to pip3.12 +RUN ln -s /usr/local/bin/pip3.12 /usr/bin/pip +RUN ln -s /usr/local/bin/pip3.12 /usr/bin/pip3 +RUN ln -s /usr/local/bin/pip3.12 /usr/local/bin/pip +RUN ln -s /usr/local/bin/pip3.12 /usr/local/bin/pip3 #update apt-get RUN apt-get update && apt-get -y upgrade diff --git a/docker/uwsgi/Dockerfile b/docker/uwsgi/Dockerfile index 084e220..baebaa8 100644 --- a/docker/uwsgi/Dockerfile +++ b/docker/uwsgi/Dockerfile @@ -25,11 +25,13 @@ RUN ln -s /usr/local/bin/python3.12.4 /usr/bin/python3 RUN ln -s /usr/local/bin/python3.12.4 /usr/local/bin/python RUN ln -s /usr/local/bin/python3.12.4 /usr/local/bin/python3 -# create links to pip3.11 -RUN ln -s /usr/local/bin/pip3.11 /usr/bin/pip -RUN ln -s /usr/local/bin/pip3.11 /usr/bin/pip3 -RUN ln -s /usr/local/bin/pip3.11 /usr/local/bin/pip -RUN ln -s /usr/local/bin/pip3.11 /usr/local/bin/pip3 +ENV PYTHONUNBUFFERED 1 + +# create links to pip3.12 +RUN ln -s /usr/local/bin/pip3.12 /usr/bin/pip +RUN ln -s /usr/local/bin/pip3.12 /usr/bin/pip3 +RUN ln -s /usr/local/bin/pip3.12 /usr/local/bin/pip +RUN ln -s /usr/local/bin/pip3.12 /usr/local/bin/pip3 # update apt-get RUN apt-get update && apt-get -y upgrade diff --git a/www/django_sample/poetry.lock b/www/django_sample/poetry.lock deleted file mode 100644 index 24373f4..0000000 --- a/www/django_sample/poetry.lock +++ /dev/null @@ -1,81 +0,0 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. - -[[package]] -name = "asgiref" -version = "3.7.2" -description = "ASGI specs, helper code, and adapters" -optional = false -python-versions = ">=3.7" -files = [ - {file = "asgiref-3.7.2-py3-none-any.whl", hash = "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e"}, - {file = "asgiref-3.7.2.tar.gz", hash = "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed"}, -] - -[package.dependencies] -typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} - -[package.extras] -tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] - -[[package]] -name = "django" -version = "5.0.3" -description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." -optional = false -python-versions = ">=3.10" -files = [ - {file = "Django-5.0.3-py3-none-any.whl", hash = "sha256:5c7d748ad113a81b2d44750ccc41edc14e933f56581683db548c9257e078cc83"}, - {file = "Django-5.0.3.tar.gz", hash = "sha256:5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df"}, -] - -[package.dependencies] -asgiref = ">=3.7.0,<4" -sqlparse = ">=0.3.1" -tzdata = {version = "*", markers = "sys_platform == \"win32\""} - -[package.extras] -argon2 = ["argon2-cffi (>=19.1.0)"] -bcrypt = ["bcrypt"] - -[[package]] -name = "sqlparse" -version = "0.4.4" -description = "A non-validating SQL parser." -optional = false -python-versions = ">=3.5" -files = [ - {file = "sqlparse-0.4.4-py3-none-any.whl", hash = "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3"}, - {file = "sqlparse-0.4.4.tar.gz", hash = "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"}, -] - -[package.extras] -dev = ["build", "flake8"] -doc = ["sphinx"] -test = ["pytest", "pytest-cov"] - -[[package]] -name = "typing-extensions" -version = "4.10.0" -description = "Backported and Experimental Type Hints for Python 3.8+" -optional = false -python-versions = ">=3.8" -files = [ - {file = "typing_extensions-4.10.0-py3-none-any.whl", hash = "sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475"}, - {file = "typing_extensions-4.10.0.tar.gz", hash = "sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb"}, -] - -[[package]] -name = "tzdata" -version = "2024.1" -description = "Provider of IANA time zone data" -optional = false -python-versions = ">=2" -files = [ - {file = "tzdata-2024.1-py2.py3-none-any.whl", hash = "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"}, - {file = "tzdata-2024.1.tar.gz", hash = "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd"}, -] - -[metadata] -lock-version = "2.0" -python-versions = "^3.10" -content-hash = "d5384f6c6c22615fd657b2d6757d4605f82ecc2da33ed4dcb39e7115016ccf7c" diff --git a/www/django_sample/pyproject.toml b/www/django_sample/pyproject.toml index 8af7a9c..64a68ef 100644 --- a/www/django_sample/pyproject.toml +++ b/www/django_sample/pyproject.toml @@ -6,7 +6,7 @@ authors = ["bluebamus "] readme = "README.md" [tool.poetry.dependencies] -python = "^3.10" +python = "^3.12.4" django = "^5.0.3"