1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-02-15 13:33:21 +02:00

Finalize merge with kaiyou/feat-multiple-db

This commit is contained in:
Tim Möhlmann 2018-12-31 18:02:07 +02:00
parent 8707b0fcd7
commit 9eaeb80a27
No known key found for this signature in database
GPG Key ID: 8677988D8072E8DE
3 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -46,3 +46,4 @@ WTForms==2.2.1
WTForms-Components==0.10.3
psycopg2
tenacity
mysqlclient

View File

@ -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)