Skip to content

Commit

Permalink
[docker] Run on latest release instead of HEAD (#300)
Browse files Browse the repository at this point in the history
  • Loading branch information
rixx committed Jan 7, 2018
1 parent 55a37b1 commit deaa657
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions Dockerfile
Expand Up @@ -15,14 +15,13 @@ COPY docker/pretalx.bash /usr/local/bin/pretalx
COPY src /src

RUN mkdir /static && \
cd /src && \
pip3 install -U pip setuptools wheel typing && \
pip3 install -r requirements.txt && \
pip3 install -r requirements/optional.txt && \
pip3 install pretalx &&
pip3 install django-redis pylibmc mysqlclient psycopg2 && \
pip3 install gunicorn && \
python3 manage.py collectstatic --noinput && \
python3 manage.py compress && \
python3 manage.py compilemessages && \
python3 -m pretalx collectstatic --noinput && \
python3 -m pretalx compress && \
python3 -m pretalx compilemessages && \
chmod +x /usr/local/bin/pretalx

RUN mkdir -p /data/logs /data/media
Expand Down
4 changes: 2 additions & 2 deletions docker/pretalx.bash
Expand Up @@ -4,12 +4,12 @@ set -e

cd /src
export PRETALX_DATA_DIR=/data
python3 manage.py migrate
python3 -m pretalx migrate

if [ "$1" == "web" ]; then
exec gunicorn \
-b '0.0.0.0:80' \
-w 3 --max-requests 1000 --max-requests-jitter 50 \
pretalx.wsgi
fi
exec python3 manage.py $*
exec python3 -m pretalx $*

0 comments on commit deaa657

Please sign in to comment.