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

Add g++ (gcc-cpp) as build dependency (#575)

Browse Source 
* Add gcc-cpp as build dependency

* add g++

* add pg binary driver

* Use the postgresql as the driver scheme

* Revert "add pg binary driver"

This reverts commit aaa3aed87e40a0f6193ba1242934fd7659a75440.
This commit is contained in:
Abhilash Raj
2022-11-05 07:38:55 -07:00
committed by GitHub
parent c48d96054c
commit 0100dc4bc0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/Dockerfile.dev
View File

@@ -15,8 +15,9 @@ ARG MM3_HK_REF
RUN --mount=type=cache,target=/root/.cache \ RUN --mount=type=cache,target=/root/.cache \
apk update \ apk update \
&& apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \ && apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \
postgresql-dev git libffi-dev \ postgresql-dev git libffi-dev g++ \
&& apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography 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 -U psycopg2 pymysql setuptools wheel \
&& python3 -m pip install \ && python3 -m pip install \
git+https://gitlab.com/mailman/mailman \ git+https://gitlab.com/mailman/mailman \

4
docker-compose.yaml
View File

@@ -13,7 +13,7 @@ services:
depends_on: depends_on:
- database - database
environment: environment:
- DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb - DATABASE_URL=postgresql://mailman:mailmanpass@database/mailmandb
- DATABASE_TYPE=postgres - DATABASE_TYPE=postgres
- DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
- HYPERKITTY_API_KEY=someapikey - HYPERKITTY_API_KEY=someapikey
@@ -36,7 +36,7 @@ services:
- /opt/mailman/web:/opt/mailman-web-data - /opt/mailman/web:/opt/mailman-web-data
environment: environment:
- DATABASE_TYPE=postgres - DATABASE_TYPE=postgres
- DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb - DATABASE_URL=postgresql://mailman:mailmanpass@database/mailmandb
- HYPERKITTY_API_KEY=someapikey - HYPERKITTY_API_KEY=someapikey
ports: ports:
- "127.0.0.1:8000:8000" # HTTP - "127.0.0.1:8000:8000" # HTTP