Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use gunicorn and bump project version to py 3.11 #164

Merged
merged 6 commits into from
Mar 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bfportal/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use an official Python runtime based on Debian 10 "buster" as a parent image.
FROM python:3.10-slim-buster
FROM python:3.11-slim-buster

# Add user that will be used in the container.
RUN useradd --create-home wagtail
Expand Down
2 changes: 1 addition & 1 deletion bfportal/bfportal/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bfportal.settings.dev")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bfportal.settings.production")

application = get_wsgi_application()
2 changes: 1 addition & 1 deletion bfportal/core/templates/core/blocks/extra_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="text-6xl">{{ block.value }}</div>
{% elif block.block_type == "cover_image" %}
{% image block.value original as img %}
<div class="min-h-80 -mx-[4.16%]"><img class="object-cover" src="{{ img.url }}" alt="{{ img.alt }}"></div>
<div class="min-h-80 -mx-[5%]"><img class="object-cover w-full" src="{{ img.url }}" alt="{{ img.alt }}"></div>
{% else %}
<div>
{{ block }}
Expand Down
4 changes: 2 additions & 2 deletions bfportal/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
bfportal_gg_production:
image: docker.pkg.github.com/battlefield-portal-community/bfportal.gg/main:latest
restart: always
command: bash -c "python manage.py migrate --noinput && python manage.py ensure_superuser --username bfportal --email superuser@bfportal.com --password '${SU_PASSWD}' && python manage.py ensure_initialization && python manage.py runserver 0.0.0.0:${PRODUCTION_PORT} --settings=bfportal.settings.production"
command: bash -c "python manage.py migrate --noinput && python manage.py ensure_superuser --username bfportal --email superuser@bfportal.com --password '${SU_PASSWD}' && python manage.py ensure_initialization && gunicorn bfportal.wsgi:application --workers 4 --bind 0.0.0.0:${PRODUCTION_PORT}"
user: "33:33"
ports:
- "${PRODUCTION_PORT}:${PRODUCTION_PORT}"
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
bfportal_gg_dev:
image: docker.pkg.github.com/battlefield-portal-community/bfportal.gg/dev:latest
restart: always
command: bash -c "python manage.py migrate --noinput && python manage.py ensure_superuser --username bfportal --email superuser@bfportal.com --password '${SU_PASSWD}' && python manage.py ensure_initialization && python manage.py runserver 0.0.0.0:${DEVEL_PORT} --settings=bfportal.settings.production"
command: bash -c "python manage.py migrate --noinput && python manage.py ensure_superuser --username bfportal --email superuser@bfportal.com --password '${SU_PASSWD}' && python manage.py ensure_initialization && gunicorn bfportal.wsgi:application --workers 4 --bind 0.0.0.0:${DEVEL_PORT}"
user: "33:33"
ports:
- "${DEVEL_PORT}:${DEVEL_PORT}"
Expand Down
140 changes: 71 additions & 69 deletions bfportal/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,104 +1,106 @@
aiohttp==3.8.1
aiosignal==1.2.0
anyascii==0.3.0
arrow==1.2.2
asgiref==3.5.0
aiohttp==3.8.4
aiosignal==1.3.1
anyascii==0.3.2
arrow==1.2.3
asgiref==3.6.0
async-timeout==4.0.2
attrs==21.4.0
beautifulsoup4==4.9.3
attrs==22.2.0
beautifulsoup4==4.11.2
binaryornot==0.4.4
bleach==5.0.1
bpyutils==0.2.0
certifi==2021.10.8
cffi==1.15.0
bleach==6.0.0
bpyutils==0.5.8
certifi==2022.12.7
cffi==1.15.1
cfgv==3.3.1
chardet==4.0.0
charset-normalizer==2.0.12
click==8.0.3
colorama==0.4.4
cookiecutter==1.7.3
cryptography==36.0.1
chardet==5.1.0
charset-normalizer==3.1.0
click==8.1.3
colorama==0.4.6
cookiecutter==2.1.1
cryptography==39.0.2
defusedxml==0.7.1
distlib==0.3.5
Django==3.2.12
distlib==0.3.6
Django==4.1.7
django-ajax-selects @ git+https://github.com/crucialfelix/django-ajax-selects.git@9bf8df4b6c61d2f89a331d67337b77c09be94321
django-allauth==0.48.0
django-autocomplete-light==3.9.1
django-browser-reload==1.3.0
django-debug-toolbar==3.2.4
django-embed-video==1.4.1
django-extensions==3.1.5
django-filter==21.1
django-autocomplete-light==3.9.4
django-browser-reload==1.7.0
django-embed-video==1.4.8
django-extensions==3.2.1
django-filter==22.1
django-livereload-server==0.4
django-markdownx==3.0.1
django-markdownx @ git+https://github.com/neutronX/django-markdownx.git@adcaa9e375a4691bbd16c4e27f8cdfb985366088
django-modelcluster==6.0
django-permissionedforms==0.1
django-taggit==3.0.0
django-tailwind==3.1.1
django-treebeard==4.5.1
django-taggit==3.1.0
django-tailwind==3.5.0
django-treebeard==4.6.1
django-widget-tweaks==1.4.12
djangorestframework==3.13.1
django_debug_toolbar==3.8.1
djangorestframework==3.14.0
docopt==0.6.2
draftjs-exporter==2.1.7
et-xmlfile==1.1.0
Faker==12.3.0
filelock==3.8.0
frozenlist==1.3.0
Faker==17.6.0
filelock==3.10.0
frozenlist==1.3.3
gunicorn==20.1.0
html5lib==1.1
identify==2.5.3
idna==3.3
Jinja2==3.0.3
identify==2.5.21
idna==3.4
isort==5.12.0
Jinja2==3.1.2
jinja2-time==0.2.0
l18n==2021.3
loguru==0.6.0
Markdown==3.3.4
MarkupSafe==2.0.1
multidict==6.0.2
Markdown==3.4.1
MarkupSafe==2.1.2
multidict==6.0.4
nodeenv==1.7.0
oauthlib==3.2.0
openpyxl==3.0.9
Pillow==8.4.0
oauthlib==3.2.2
openpyxl==3.1.2
Pillow==9.4.0
pipreqs==0.4.11
pipupgrade==1.11.0
platformdirs==2.5.2
pipupgrade==1.12.0
platformdirs==2.6.2
poyo==0.5.0
pre-commit==2.20.0
psycopg2==2.9.3
py-cord==2.0.0b4
pre-commit==3.2.0
psycopg2==2.9.5
py-cord==2.4.0
pycparser==2.21
PyJWT==2.3.0
PyJWT==2.6.0
python-dateutil==2.8.2
python-dotenv==0.19.2
python-slugify==5.0.2
python-dotenv==1.0.0
python-slugify==8.0.1
python3-openid==3.2.0
pytz==2021.3
pytz==2022.7.1
PyYAML==6.0
requests==2.27.1
requests==2.28.2
requests-oauthlib==1.3.1
six==1.16.0
soupsieve==2.3.1
sqlparse==0.4.2
tablib==3.2.0
telepath==0.2
soupsieve==2.4
sqlparse==0.4.3
tablib==3.3.0
telepath==0.3
text-unidecode==1.3
tinycss2==1.1.1
tinycss2==1.2.1
toml==0.10.2
tornado==6.1
tzdata==2021.5
Unidecode==1.3.2
urllib3==1.26.8
tornado==6.2
tzdata==2022.7
Unidecode==1.3.6
urllib3==1.26.15
virtualenv==20.16.3
wagtail==4.0.2
wagtail==4.2.1
wagtail-autocomplete @ git+https://github.com/wagtail/wagtail-autocomplete.git@03f46a0c256989690d0a43fc21fe0f37f9ede765
wagtail-color-panel==1.3.1
wagtail-generic-chooser==0.4
wagtailsvg==0.0.33
wagtail-generic-chooser==0.5.1
wagtailsvg==0.0.37
webencodings==0.5.1
whitenoise==6.2.0
Willow==1.4
win32-setctime==1.0.4
whitenoise==6.4.0
Willow==1.4.1
win32-setctime==1.1.0
xlrd==2.0.1
XlsxWriter==3.0.2
XlsxWriter==3.0.9
xlwt==1.3.0
yarg==0.1.9
yarl==1.7.2
yarl==1.8.2
12 changes: 6 additions & 6 deletions bfportal/theme/static_src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.