1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-11-25 22:12:28 +02:00

Revert "Implement CIText as NOCASE alternative in postgresql"

This reverts commit 0f3c1b9d15.
This commit is contained in:
kaiyou
2018-12-10 15:01:27 +01:00
parent f52ae5535c
commit 76925e82f3
9 changed files with 16 additions and 60 deletions

View File

@@ -7,7 +7,7 @@ RUN apk add --no-cache \
RUN pip3 install jinja2
# Image specific layers under this line
RUN apk add --no-cache \
postgresql postgresql-libs postgresql-contrib busybox-suid sudo tar \
postgresql postgresql-libs busybox-suid sudo tar \
&& apk add --virtual .build-deps gcc musl-dev postgresql-dev python3-dev \
&& pip3 install psycopg2 anosql \
&& apk --purge del .build-deps

View File

@@ -40,10 +40,3 @@ select 1
create
database mailu
owner mailu;
-- name: create_citext!
-- Install the CIText extension
create
extension
if not exists
citext;

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)
@@ -23,10 +23,6 @@ def setup():
queries.create_db(conn)
conn.set_isolation_level(1)
conn.close()
conn = psycopg2.connect(user = 'postgres', database= 'mailu')
queries.create_citext(conn)
conn.commit()
conn.close()
# Check if /data is empty
if not os.listdir("/data"):