Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #256 from aiomaster/master

Browse Source 
fix mailman.cfg issue
This commit is contained in:
Abhilash Raj
2018-07-05 10:42:59 -07:00
committed by GitHub
parent d9c5d6ef95 770267b417
commit f11d397ab1
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@@ -10,7 +10,7 @@ if [ "$1" = "dev" ]; then
fi fi
REG_URL=${REGISTRY}_URL REG_URL=${REGISTRY}_URL
TAG=0.1 : "${TAG:=0.1}"
if [ "$EVENT_TYPE" = "cron" ] || [ "$DEV" = "true" ]; then if [ "$EVENT_TYPE" = "cron" ] || [ "$DEV" = "true" ]; then
python3 -m venv venv python3 -m venv venv

2
core/Dockerfile
View File

@@ -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 #Install all required packages, add user for executing mailman and set execution rights for startup script
RUN apk update \ 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 \ && apk add bash su-exec postgresql-client mysql-client curl \
&& pip install psycopg2 \ && pip install psycopg2 \
mailman==3.1.1 \ mailman==3.1.1 \

2
core/Dockerfile.dev
View File

@@ -13,7 +13,7 @@ ARG MM3_HK_REF
#Install all required packages, add user for executing mailman and set execution #Install all required packages, add user for executing mailman and set execution
#rights for startup script #rights for startup script
RUN apk update \ 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 \ && apk add bash su-exec postgresql-client mysql-client curl \
&& pip install -U psycopg2 pymysql \ && pip install -U psycopg2 pymysql \
git+https://gitlab.com/mailman/mailman@${CORE_REF} \ git+https://gitlab.com/mailman/mailman@${CORE_REF} \

2
core/docker-entrypoint.sh
View File

@@ -114,7 +114,7 @@ then
fi fi
# Generate a basic mailman.cfg. # Generate a basic mailman.cfg.
cat > /etc/mailman.cfg << EOF cat >> /etc/mailman.cfg << EOF
[runner.retry] [runner.retry]
sleep_time: 10s sleep_time: 10s