diff --git a/Dockerfile b/Dockerfile index 2d8f848eb2..5b6a11bb19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,18 +41,6 @@ RUN apt-get update && \ ENV LC_ALL=C.UTF-8 \ DJANGO_SETTINGS_MODULE=production_settings -# To copy only the requirements files needed to install from PIP -COPY src/setup.py /pretix/src/setup.py -RUN pip3 install -U \ - pip \ - setuptools \ - wheel && \ - cd /pretix/src && \ - PRETIX_DOCKER_BUILD=TRUE pip3 install \ - -e ".[memcached,mysql]" \ - gunicorn django-extensions ipython && \ - rm -rf ~/.cache/pip - COPY deployment/docker/pretix.bash /usr/local/bin/pretix COPY deployment/docker/supervisord /etc/supervisord COPY deployment/docker/supervisord.all.conf /etc/supervisord.all.conf @@ -60,9 +48,18 @@ COPY deployment/docker/supervisord.web.conf /etc/supervisord.web.conf COPY deployment/docker/nginx.conf /etc/nginx/nginx.conf COPY deployment/docker/nginx-max-body-size.conf /etc/nginx/conf.d/nginx-max-body-size.conf COPY deployment/docker/production_settings.py /pretix/src/production_settings.py +COPY pyproject.toml /pretix/pyproject.toml COPY src /pretix/src -RUN cd /pretix/src && python setup.py install +RUN pip3 install -U \ + pip \ + setuptools \ + wheel && \ + cd /pretix && \ + PRETIX_DOCKER_BUILD=TRUE pip3 install \ + -e ".[memcached,mysql]" \ + gunicorn django-extensions ipython && \ + rm -rf ~/.cache/pip RUN chmod +x /usr/local/bin/pretix && \ rm /etc/nginx/sites-enabled/default && \