From 0100dc4bc01946760bd38523305cdf6196a4dd76 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 5 Nov 2022 07:38:55 -0700 Subject: [PATCH] Add g++ (gcc-cpp) as build dependency (#575) * 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. --- core/Dockerfile.dev | 5 +++-- docker-compose.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 792b373..9c58bf3 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -15,8 +15,9 @@ ARG MM3_HK_REF 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 py-cryptography mariadb-connector-c \ + 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 \ && python3 -m pip install -U psycopg2 pymysql setuptools wheel \ && python3 -m pip install \ git+https://gitlab.com/mailman/mailman \ diff --git a/docker-compose.yaml b/docker-compose.yaml index ecc7ec9..edb0290 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: depends_on: - database environment: - - DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb + - DATABASE_URL=postgresql://mailman:mailmanpass@database/mailmandb - DATABASE_TYPE=postgres - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase - HYPERKITTY_API_KEY=someapikey @@ -36,7 +36,7 @@ services: - /opt/mailman/web:/opt/mailman-web-data environment: - DATABASE_TYPE=postgres - - DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb + - DATABASE_URL=postgresql://mailman:mailmanpass@database/mailmandb - HYPERKITTY_API_KEY=someapikey ports: - "127.0.0.1:8000:8000" # HTTP