From bf6689a45e394a7c89d417652383754e694f9ca9 Mon Sep 17 00:00:00 2001 From: Christoph Wagner Date: Tue, 3 Jul 2018 02:22:47 +0200 Subject: [PATCH 1/3] fix mailman.cfg issue We have to append ">>" to /etc/mailman.cfg and not to overwrite previously written content with ">". Problem was that the database config made in setup_database was overriden. --- core/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh index e6812ee..870a8ec 100755 --- a/core/docker-entrypoint.sh +++ b/core/docker-entrypoint.sh @@ -114,7 +114,7 @@ then fi # Generate a basic mailman.cfg. -cat > /etc/mailman.cfg << EOF +cat >> /etc/mailman.cfg << EOF [runner.retry] sleep_time: 10s From 6d1ea69bb183c740db1fd6333dda6c1ba1f92fd7 Mon Sep 17 00:00:00 2001 From: Christoph Wagner Date: Wed, 4 Jul 2018 20:25:53 +0200 Subject: [PATCH 2/3] fix container build by adding libffi-dev --- core/Dockerfile | 2 +- core/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index da0d1e0..acd4057 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -7,7 +7,7 @@ COPY docker-entrypoint.sh /usr/local/bin/ #Install all required packages, add user for executing mailman and set execution rights for startup script RUN apk update \ - && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \ + && 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 psycopg2 \ mailman==3.1.1 \ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 66589c3..08045bc 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -13,7 +13,7 @@ ARG MM3_HK_REF #Install all required packages, add user for executing mailman and set execution #rights for startup script RUN apk update \ - && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev git \ + && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev git libffi-dev \ && apk add bash su-exec postgresql-client mysql-client curl \ && pip install -U psycopg2 pymysql \ git+https://gitlab.com/mailman/mailman@${CORE_REF} \ From 770267b4172b92d4494999662ab33cae18d44b44 Mon Sep 17 00:00:00 2001 From: Christoph Wagner Date: Wed, 4 Jul 2018 21:07:31 +0200 Subject: [PATCH 3/3] set TAG in build only if not set before --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f92d66e..1d37d54 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if [ "$1" = "dev" ]; then fi REG_URL=${REGISTRY}_URL -TAG=0.1 +: "${TAG:=0.1}" if [ "$EVENT_TYPE" = "cron" ] || [ "$DEV" = "true" ]; then python3 -m venv venv