diff --git a/core/Dockerfile b/core/Dockerfile index 0461cb3..3d1a593 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -5,11 +5,9 @@ MAINTAINER Abhilash Raj # Install the latest master branch of the mailman directly # from the Gitlab. RUN apk update \ - && apk add --virtual build-deps gcc python3-dev musl-dev wget \ + && apk add --virtual build-deps gcc python3-dev musl-dev \ && apk add postgresql-dev bash su-exec postgresql-client \ - && wget -O mailman_hyperkitty.zip https://gitlab.com/mailman/mailman-hyperkitty/repository/archive.zip?ref=master \ - && pip install mailman_hyperkitty.zip psycopg2 mailman==3.1.0rc1 \ - && rm mailman_hyperkitty.zip \ + && pip install psycopg2 mailman==3.1.0 mailman-hyperkitty==1.1.0 \ && apk del build-deps ADD assets/run.sh /opt/run.sh diff --git a/web/assets/run.sh b/web/assets/run.sh index e766716..b34ddc9 100755 --- a/web/assets/run.sh +++ b/web/assets/run.sh @@ -94,9 +94,7 @@ python manage.py migrate if [[ ! -v UWSGI_LOGTO ]]; then echo "No UWSGI_LOGTO defined, logging uwsgi to /opt/mailman-web-data/logs/uwsgi.log ..." export UWSGI_LOGTO='/opt/mailman-web-data/logs/uwsgi.log' - if [[ ! -e "$UWSGI_LOGTO" ]]; then - touch "$UWSGI_LOGTO" - fi + touch "$UWSGI_LOGTO" fi if [[ ! -v UWSGI_WSGI_FILE ]]; then