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.

Sign up for GitHub

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

Jump to bottom

Switch to poetry #298

Merged
merged 6 commits into from
Oct 26, 2022
Merged

Switch to poetry #298

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
075f68d
Use poetry, update Dependencies
jandd Jun 27, 2022
79b1b50
Fix deprecations
jandd Jun 27, 2022
989485d
Use poetry to install dependencies in Dockerfiles
jandd Oct 11, 2022
0fd905b
Use relative paths for python3 in venv
jandd Oct 11, 2022
7d2e21a
Switch to a compatible set of dependencies
jandd Oct 11, 2022
2ceccea
Merge branch 'development' into switch-to-poetry
jandd Oct 26, 2022
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
26 changes: 13 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim AS builder
FROM debian:bullseye-slim AS builder

RUN set -eu ; \
export DEBIAN_FRONTEND=noninteractive ; \
Expand Down Expand Up @@ -44,7 +44,7 @@ RUN \
--uid 10000 \
devday

COPY Pipfile Pipfile.lock /python-code/
COPY pyproject.toml poetry.lock /python-code/
WORKDIR /python-code/

RUN \
Expand All @@ -54,16 +54,14 @@ RUN \
export PYTHONFAULTHANDLER=1 ; \
export PIP_NO_CACHE_DIR=off ; \
export PIP_DISABLE_VERSION_CHECK=on ; \
export PIP_DEFAULT_TIMEOUT=100 ; \
export PIPENV_HIDE_EMOJIS=true ; \
export PIPENV_COLORBLIND=true ; \
export PIPENV_NOSPIN=true ; \
export PIPENV_DOTENV_LOCATION=config/.env ; \
export PIPENV_USE_SYSTEM=1 \
&& python3 -m pip install -U pip wheel pipenv \
&& pipenv install --three --system --deploy --ignore-pipfile \
export PIP_DEFAULT_TIMEOUT=100 \
&& python3 -m pip install -U wheel poetry \
&& poetry config virtualenvs.in-project true \
&& poetry install \
&& rm -rf /root/.cache /root/.local /tmp/*.json \
&& python3 -m pip uninstall --yes pipenv
&& python3 -m pip uninstall --yes poetry

ENV PATH="/python-code/.venv/bin:$PATH"

COPY devday /app/
RUN set -eu ; \
Expand All @@ -72,7 +70,7 @@ RUN set -eu ; \
&& DJANGO_SETTINGS_MODULE=compilemessages_settings python3 manage.py compilemessages \
&& rm -rf compilemessages_settings.py __pycache__ /var/lib/apt/lists/*

FROM debian:buster-slim
FROM debian:bullseye-slim
LABEL maintainer="Jan Dittberner <jan.dittberner@t-systems.com>"
LABEL vendor="T-Systems Multimedia Solutions GmbH"

Expand Down Expand Up @@ -118,7 +116,7 @@ COPY devday /app/

COPY docker/app/start-application.sh docker/app/uwsgi.ini docker/app/devday.wsgi /app/

COPY --from=builder /usr/local/lib/python3.7/dist-packages /usr/local/lib/python3.7/dist-packages
COPY --from=builder /python-code/.venv /python-code/.venv
COPY --from=builder /app/attendee/locale/de/LC_MESSAGES/django.mo /app/attendee/locale/de/LC_MESSAGES/
COPY --from=builder /app/devday/locale/de/LC_MESSAGES/django.mo /app/devday/locale/de/LC_MESSAGES/
COPY --from=builder /app/event/locale/de/LC_MESSAGES/django.mo /app/event/locale/de/LC_MESSAGES/
Expand All @@ -133,4 +131,6 @@ RUN mkdir -p /app/media /app/static /app/logs ; \
VOLUME /app/media /app/static /app/logs
USER devday

ENV PATH="/python-code/.venv/bin:$PATH"

ENTRYPOINT ["dumb-init", "/app/start-application.sh"]
50 changes: 0 additions & 50 deletions Pipfile
View file
Open in desktop

This file was deleted.

Loading