Reworked docker container structure

This commit is contained in:
Raphael Michel
2015-09-15 21:43:43 +02:00
parent 2f0bb5f39f
commit 0530416c66
3 changed files with 45 additions and 19 deletions
+6 -8
View File
@@ -24,12 +24,8 @@ ADD gunicorn_starter.bash /gunicorn_starter.bash
RUN git clone --recursive --depth 1 https://github.com/pretix/pretix.git /pretix
WORKDIR /pretix/src
RUN pip3 install -r requirements.txt
RUN pip3 install -r requirements/mysql.txt
RUN pip3 install -r requirements/postgres.txt
RUN pip3 install -r requirements/memcached.txt
RUN pip3 install -r requirements/redis.txt
RUN pip3 install gunicorn
RUN pip3 install -r requirements.txt -r requirements/mysql.txt -r requirements/postgres.txt \
-r requirements/memcached.txt -r requirements/celery.txt -r requirements/redis.txt gunicorn
RUN make
@@ -37,8 +33,10 @@ RUN mkdir /etc/pretix
RUN mkdir /data
VOLUME /etc/pretix
RUN chmod +x /gunicorn_starter.bash
ADD pretix.bash /usr/local/bin/pretix
RUN chmod +x /usr/local/bin/pretix
EXPOSE 80
CMD ["/gunicorn_starter.bash"]
ENTRYPOINT ["pretix"]
CMD ["web"]
@@ -1,11 +0,0 @@
#!/bin/bash
cd /pretix/src
export DJANGO_SETTINGS_MODULE=pretix.settings
export DATA_DIR=/data/
python3 manage.py migrate
python3 manage.py collectstatic --noinput
python3 manage.py compress
gunicorn \
-b '0.0.0.0:80' \
-w 3 --max-requests 1000 --max-requests-jitter 50 \
pretix.wsgi
+39
View File
@@ -0,0 +1,39 @@
#!/bin/bash
cd /pretix/src
export DJANGO_SETTINGS_MODULE=pretix.settings
export DATA_DIR=/data/
NUM_WORKERS=25
if [ ! -d /data/logs ]; then
mkdir /data/logs;
fi
if [ ! -d /data/media ]; then
mkdir /data/media;
fi
if [ "$1" == "web" ]; then
python3 manage.py collectstatic --noinput
python3 manage.py compress
exec gunicorn pretix.wsgi \
--name pretix \
--workers $NUM_WORKERS \
--max-requests 1200 \
--max-requests-jitter 50 \
--log-level=info \
--bind=0.0.0.0:80
fi
if [ "$1" == "worker" ]; then
exec celery -A pretix worker -l info
fi
if [ "$1" == "migrate" ]; then
exec python manage.py migrate --noinput
fi
if [ "$1" == "shell" ]; then
exec python manage.py shell
fi
echo "Specify argument: web|worker|migrate|shell"
exit 1