diff --git a/Dockerfile b/Dockerfile index d7a18263c2281c4780e6f1a98d9f15bb18a9d4de..8f3cda3e916c7473b42c1f97d31f3f09db31296b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,33 @@ -FROM python:3.6-alpine +FROM python:3.6 ARG django_version=1.11 -ARG dev_packages="gcc g++ postgresql-dev" +ARG dev_packages="gcc g++ libpq-dev" ADD ./entrypoint.sh / VOLUME /static +VOLUME /media WORKDIR /app -RUN apk update && \ - apk add bash git \ - ${dev_packages} && \ - DJANGO_VERSION=$(echo ${django_version} | \ +RUN apt-get update && \ + apt-get install -y glusterfs-client git ${dev_packages} && \ + DJANGO_VERSION=$(echo ${django_version} | \ awk -F. '{bump=$NF+1;for(i=1;i<NF;i++){printf("%s.",$i)};printf("%s",bump)}') && \ - pip install "Django<=${DJANGO_VERSION}" gunicorn \ - psycopg2-binary psycopg2 mysql-connector \ + pip install "Django<=${DJANGO_VERSION}" gunicorn \ + psycopg2-binary psycopg2 mysql-connector \ django-heroku whitenoise[brotli] && \ - apk del ${dev_packages} && \ + apt-get purge -y ${dev_packages} && \ + apt-get autoremove -y && \ rm -fr /root/.cache +# RUN apk update && \ +# apk add bash git \ +# ${dev_packages} && \ +# DJANGO_VERSION=$(echo ${django_version} | \ +# awk -F. '{bump=$NF+1;for(i=1;i<NF;i++){printf("%s.",$i)};printf("%s",bump)}') && \ +# pip install "Django<=${DJANGO_VERSION}" gunicorn \ +# psycopg2-binary psycopg2 mysql-connector \ +# django-heroku whitenoise[brotli] && \ +# apk del ${dev_packages} && \ +# rm -fr /root/.cache + ENTRYPOINT [ "/entrypoint.sh" ]