From 274965ccede02e0336e448409ac16facfa6d883d Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Thu, 26 Jul 2018 18:10:37 -0700 Subject: [PATCH] Update stable containers to 3.2 suite release. --- core/Dockerfile | 3 ++- docker-compose.yaml | 4 ++-- web/Dockerfile | 12 ++++++------ web/Dockerfile.dev | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index acd4057..d163229 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -9,8 +9,9 @@ COPY docker-entrypoint.sh /usr/local/bin/ RUN apk update \ && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev libffi-dev \ && apk add bash su-exec postgresql-client mysql-client curl \ + && pip install -U pip \ && pip install psycopg2 \ - mailman==3.1.1 \ + mailman==3.2 \ mailman-hyperkitty==1.1.0 \ pymysql \ && apk del build-deps \ diff --git a/docker-compose.yaml b/docker-compose.yaml index b88a5a9..bb84c8b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2' services: mailman-core: - image: maxking/mailman-core:0.1 + image: maxking/mailman-core:0.2 container_name: mailman-core hostname: mailman-core volumes: @@ -22,7 +22,7 @@ services: ipv4_address: 172.19.199.2 mailman-web: - image: maxking/mailman-web:0.1 + image: maxking/mailman-web:0.2 container_name: mailman-web hostname: mailman-web depends_on: diff --git a/web/Dockerfile b/web/Dockerfile index c847bf1..356a050 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7-alpine3.6 +FROM python:3.6-alpine3.7 MAINTAINER Abhilash Raj @@ -15,11 +15,11 @@ RUN set -ex \ postgresql-dev mariadb-dev \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py-mysqldb curl mailcap \ - && pip install -U django==1.11 pip \ - && pip install mailmanclient==3.1.1 \ - postorius==1.1.2 \ - hyperkitty==1.1.4 \ - django-mailman3==1.1.0 \ + && pip install -U django==2.0.5 pip \ + && pip install mailmanclient==3.2.0 \ + postorius==1.2.1 \ + hyperkitty==1.2.0 \ + django-mailman3==1.2.0 \ whoosh \ uwsgi \ psycopg2 \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 56433b0..73ed759 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM python:3.6-alpine3.6 +FROM python:3.6-alpine3.7 MAINTAINER Abhilash Raj