Skip to content

Commit

Permalink
Chore: default to PIP user installation
Browse files Browse the repository at this point in the history
  • Loading branch information
almereyda committed May 22, 2024
1 parent aee0664 commit ec5aa56
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion context/default/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ FROM ${BASE_IMAGE}:${BASE_TAG}
ARG PRETALX_VERSION=2024.1.0

# Install Pretalx with Postgres and Redis database adapters
RUN pip3 install -U pretalx[mysql,postgres,redis]==${PRETALX_VERSION}
RUN pip3 install -U --user pretalx[mysql,postgres,redis]==${PRETALX_VERSION}
6 changes: 3 additions & 3 deletions context/extended/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ ARG PRETALX_BASE_IMAGE=docker.io/library/pretalx/pretalx
ARG PRETALX_BASE_TAG=2024.1.0

FROM ${PRETALX_BASE_IMAGE}:${PRETALX_BASE_TAG} AS system
RUN pip3 install -U prtx-faq \
pretalx-pages \
pretalx-public-voting
RUN pip3 install -U --user prtx-faq \
pretalx-pages \
pretalx-public-voting
4 changes: 2 additions & 2 deletions context/source/extended.cron/Dockerfile.debian.remote
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ FROM ${PRETALX_BASE_IMAGE}:${PRETALX_BASE_TAG} AS system

ARG PRETALX_REPO=https://github.com/pretalx/pretalx.git
ARG PRETALX_REF=main
RUN pip3 install git+${PRETALX_REPO}@${PRETALX_REF}#egg=pretalx[mysql,postgres,redis]
RUN pip3 install --user git+${PRETALX_REPO}@${PRETALX_REF}#egg=pretalx[mysql,postgres,redis]

RUN pip3 install git+https://github.com/pretalx/prtx-faq.git@master#egg=prtx-faq \
RUN pip3 install --user git+https://github.com/pretalx/prtx-faq.git@master#egg=prtx-faq \
git+https://github.com/pretalx/pretalx-pages.git@main#egg=pretalx-pages \
git+https://github.com/pretalx/pretalx-public-voting.git@main#egg=pretalx-public-voting

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG PRETALX_BASE_TAG=2024.1.0-source-remote
FROM ${PRETALX_BASE_IMAGE}:${PRETALX_BASE_TAG} AS standalone-extended-cron

USER pretalx
RUN pip3 install git+https://github.com/pretalx/prtx-faq.git@master#egg=prtx-faq \
RUN pip3 install --user git+https://github.com/pretalx/prtx-faq.git@master#egg=prtx-faq \
git+https://github.com/pretalx/pretalx-pages.git@main#egg=pretalx-pages \
git+https://github.com/pretalx/pretalx-public-voting.git@main#egg=pretalx-public-voting

Expand Down
2 changes: 1 addition & 1 deletion context/source/standalone/Dockerfile.debian.local
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM ${PRETALX_BASE_IMAGE}:${PRETALX_BASE_TAG} AS standalone
COPY --chown=999 pretalx/pyproject.toml /pretalx
COPY --chown=999 pretalx/src /pretalx/src

RUN pip3 install -e /pretalx/[mysql,postgres,redis]
RUN pip3 install --user -e /pretalx/[mysql,postgres,redis]

USER root
# Install supervisor
Expand Down
2 changes: 1 addition & 1 deletion context/source/standalone/Dockerfile.debian.remote
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM ${PRETALX_BASE_IMAGE}:${PRETALX_BASE_TAG} AS standalone
ARG PRETALX_REPO=https://github.com/pretalx/pretalx.git
ARG PRETALX_REF=main

RUN pip3 install git+${PRETALX_REPO}@${PRETALX_REF}#egg=pretalx[mysql,postgres,redis]
RUN pip3 install --user git+${PRETALX_REPO}@${PRETALX_REF}#egg=pretalx[mysql,postgres,redis]

USER root
# Install supervisor
Expand Down
6 changes: 3 additions & 3 deletions context/standalone/extended/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ARG PRETALX_BASE_TAG=2024.1.0
FROM ${PRETALX_BASE_IMAGE}:${PRETALX_BASE_TAG} AS system

USER pretalx
RUN pip3 install -U prtx-faq \
pretalx-pages \
pretalx-public-voting
RUN pip3 install -U --user prtx-faq \
pretalx-pages \
pretalx-public-voting

USER root

0 comments on commit ec5aa56

Please sign in to comment.