self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-11-27 22:18:22 +02:00
Code Issues Releases Activity

Finalize merge with kaiyou/feat-multiple-db

Browse Source
This commit is contained in:
Tim Möhlmann
2018-12-31 18:02:07 +02:00
parent 8707b0fcd7
commit 9eaeb80a27
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/admin/Dockerfile
View File

@@ -8,8 +8,9 @@ RUN mkdir -p /app
WORKDIR /app WORKDIR /app
COPY requirements-prod.txt requirements.txt COPY requirements-prod.txt requirements.txt
RUN apk add --no-cache openssl curl \ RUN apk add --no-cache libressl curl \
&& apk add --no-cache --virtual build-dep openssl-dev libffi-dev python3-dev build-base \ && 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 \ && pip3 install -r requirements.txt \
&& apk del --no-cache build-dep && apk del --no-cache build-dep

1
core/admin/requirements-prod.txt
View File

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

2
optional/postgresql/start.py
View File

@@ -8,7 +8,7 @@ import os
import subprocess import subprocess
def setup(): def setup():
conn = psycopg2.connect('user=postgres') conn = psycopg2.connect(user='postgres')
queries = anosql.load_queries('postgres', '/conf/queries.sql') queries = anosql.load_queries('postgres', '/conf/queries.sql')
# Mailu user # Mailu user
queries.create_mailu_user(conn) queries.create_mailu_user(conn)