diff --git a/core/Dockerfile b/core/Dockerfile index 0b35dd5..ca904e6 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -10,12 +10,12 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \ libffi-dev \ # psutil needs linux-headers to compile on musl c library. - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers mariadb-connector-c \ + && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ mailman==3.3.5 \ - mailman-hyperkitty==1.1.0 \ + mailman-hyperkitty==1.2.0 \ pymysql \ 'sqlalchemy<1.4.0' \ && apk del build-deps \ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 66eb78a..384b170 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache \ apk update \ && apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \ postgresql-dev git libffi-dev \ - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers mariadb-connector-c \ + && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ && python3 -m pip install -U psycopg2 pymysql setuptools wheel \ && python3 -m pip install \ git+https://gitlab.com/mailman/mailman@${CORE_REF} \ diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh index 9c6ab17..80aa6c7 100755 --- a/core/docker-entrypoint.sh +++ b/core/docker-entrypoint.sh @@ -36,7 +36,7 @@ fi # SMTP_HOST defaults to the gateway if [[ ! -v SMTP_HOST ]]; then export SMTP_HOST=$(/sbin/ip route | awk '/default/ { print $3 }') - echo "SMPT_HOST not specified, using the gateway ($SMTP_HOST) as default" + echo "SMTP_HOST not specified, using the gateway ($SMTP_HOST) as default" fi if [[ ! -v SMTP_PORT ]]; then diff --git a/docker-compose-mysql.yaml b/docker-compose-mysql.yaml index e97c602..5d8358e 100644 --- a/docker-compose-mysql.yaml +++ b/docker-compose-mysql.yaml @@ -7,6 +7,7 @@ services: hostname: mailman-core volumes: - /opt/mailman/core:/opt/mailman/ + stop_grace_period: 30s links: - database:database depends_on: @@ -34,8 +35,8 @@ services: volumes: - /opt/mailman/web:/opt/mailman-web-data environment: + - DATABASE_TYPE=mysql - DATABASE_URL=mysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4 - - DATABASE_TYPE=mysql - HYPERKITTY_API_KEY=someapikey - SECRET_KEY=thisisaverysecretkey - DYLD_LIBRARY_PATH=/usr/local/mysql/lib/ @@ -51,7 +52,6 @@ services: MYSQL_USER: mailman MYSQL_PASSWORD: mailmanpass MYSQL_RANDOM_ROOT_PASSWORD: "yes" - restart: always image: mariadb:10.5 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci volumes: @@ -60,7 +60,7 @@ services: mailman: networks: - mailman: + mailman: driver: bridge ipam: driver: default diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 2d235b4..408c832 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ - python3 py3-pip libffi libuuid pcre-dev \ + python3 py3-pip libffi libuuid pcre-dev py-cryptography \ && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ && python3 -m pip install postorius==1.3.6 \ uwsgi \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index f6bf5fa..622ccf0 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev git cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap \ - python3 py3-pip libffi gettext \ + python3 py3-pip libffi gettext py-cryptography \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \ diff --git a/web/Dockerfile b/web/Dockerfile index ff3cf59..31d53cc 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ - python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev \ + python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ && pip install mailmanclient==3.3.3 \ postorius==1.3.6 \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 426e195..648c980 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc pcre-dev \ python3 py3-pip postgresql-client mysql-client py3-mysqlclient \ - curl mailcap xapian-core xapian-bindings-python3 libffi gettext \ + curl mailcap xapian-core xapian-bindings-python3 libffi gettext py-cryptography \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/mailmanclient@${CLIENT_REF} \