diff --git a/Dockerfile b/Dockerfile index 452f6ff..b5e8281 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,19 @@ FROM python:alpine WORKDIR /ivatar -RUN apk add --no-cache --virtual build-deps build-base gcc python2-dev python3-dev musl-dev git && \ - apk add --no-cache jpeg-dev openldap-dev libffi-dev mariadb-dev zlib-dev -RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so +# RUN apk add --no-cache --virtual build-deps build-base gcc python3-dev musl-dev git && \ +RUN apk add --no-cache py3-virtualenv openldap-dev libffi-dev mariadb-dev zlib-dev +# RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so -RUN pip install --upgrade pip setuptools==57.5.0 -RUN pip install 2to3 pillow +# RUN pip install --upgrade pip setuptools==57.5.0 +# RUN pip install 2to3 pillow RUN git clone https://git.linux-kernel.at/oliver/ivatar.git . -RUN pip install -r requirements.txt + +RUN virtualenv -p python3 .virtualenv && \ + source .virtualenv/bin/activate && \ + pip install pillow && \ + pip install -r requirements.txt RUN apk del build-deps && pip cache purge diff --git a/entrypoint.sh b/entrypoint.sh index 993c245..989c038 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/ash -python ./manage.py migrate -exec python ./manage.py runserver 0:8080 +./manage.py migrate +exec ./manage.py runserver 0:8080