From 9eaeb80a274abde17a72a3d6f7c8de6a2f248a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Mon, 31 Dec 2018 18:02:07 +0200 Subject: [PATCH] Finalize merge with kaiyou/feat-multiple-db --- core/admin/Dockerfile | 5 +++-- core/admin/requirements-prod.txt | 1 + optional/postgresql/start.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 6fcb4601..954ce7e7 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -8,8 +8,9 @@ RUN mkdir -p /app WORKDIR /app COPY requirements-prod.txt requirements.txt -RUN apk add --no-cache openssl curl \ - && apk add --no-cache --virtual build-dep openssl-dev libffi-dev python3-dev build-base \ +RUN apk add --no-cache libressl curl \ + && apk add --no-cache --virtual build-dep \ + libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev \ && pip3 install -r requirements.txt \ && apk del --no-cache build-dep diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt index 74fb219a..53240759 100644 --- a/core/admin/requirements-prod.txt +++ b/core/admin/requirements-prod.txt @@ -46,3 +46,4 @@ WTForms==2.2.1 WTForms-Components==0.10.3 psycopg2 tenacity +mysqlclient diff --git a/optional/postgresql/start.py b/optional/postgresql/start.py index 9d35ba9c..f9c7fdc2 100755 --- a/optional/postgresql/start.py +++ b/optional/postgresql/start.py @@ -8,7 +8,7 @@ import os import subprocess def setup(): - conn = psycopg2.connect('user=postgres') + conn = psycopg2.connect(user='postgres') queries = anosql.load_queries('postgres', '/conf/queries.sql') # Mailu user queries.create_mailu_user(conn)