various install fixes

Author: clovis

Dockerfile

@@ -14,6 +14,17 @@ COPY docker_autostart.sh /usr/local/bin/init_textpair_db
 COPY textpair /textpair/textpair
 
 RUN apt update && apt install -y postgresql postgresql-contrib curl git locales libpq-dev python3-pip sudo ripgrep liblz4-tool && curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash && apt-get install -y nodejs && apt-get clean && rm -rf /var/lib/apt && cd /textpair && ./install.sh && mkdir -p /var/www/html/text-pair && echo "[WEB_APP]\nweb_app_path = /var/www/html/text-pair\napi_server = http://localhost/text-pair-api\n[DATABASE]\ndatabase_name = textpair\ndatabase_user = textpair\ndatabase_password = textpair" > /etc/text-pair/global_settings.ini && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
+RUN mkdir /etc/philologic && echo 'database_root = "/var/www/html/philologic"\nurl_root = "http://localhost/philologic/"\nweb_app_dir = "/var/lib/philologic4/web_app/"' > /etc/philologic/philologic4.cfg
+
+USER postgres
+RUN service postgresql start && sleep 5 && \
+    psql --command "CREATE DATABASE textpair;" && \
+    psql --command "CREATE ROLE textpair WITH LOGIN PASSWORD 'textpair';" && \
+    psql --command "GRANT ALL PRIVILEGES ON DATABASE textpair TO textpair;" && \
+    psql -d textpair --command "CREATE EXTENSION pg_trgm;" && \
+    perl -pi -e 's/^(local.*)peer$/$1 md5/;' /etc/postgresql/14/main/pg_hba.conf
+
+USER root
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8

api_server/web_server.sh

@@ -13,7 +13,7 @@ CERTFILE=
 
 if [ -z "$KEYFILE" ]
 then
-    gunicorn -k uvicorn.workers.UvicornWorker -b :$PORT -w 4 --access-logfile=/var/lib/text-pair/api_server/access.log --error-logfile=/var/lib/text-pair/api_server/error.log --chdir /var/lib/text-pair/api/ text_pair:app
+    /var/lib/text-pair/textpair_env/bin/gunicorn -k uvicorn.workers.UvicornWorker -b :$PORT -w 4 --access-logfile=/var/lib/text-pair/api_server/access.log --error-logfile=/var/lib/text-pair/api_server/error.log --chdir /var/lib/text-pair/api/ text_pair:app
 else
-    gunicorn --keyfile=$KEYFILE --certfile=$CERTFILE -k uvicorn.workers.UvicornWorker -b :$PORT -w 4 --access-logfile=/var/lib/text-pair/api_server/access.log --error-logfile=/var/lib/text-pair/api_server/error.log --chdir /var/lib/text-pair/api/ text_pair:app
+    /var/lib/text-pair/textpair_env/bin/gunicorn --keyfile=$KEYFILE --certfile=$CERTFILE -k uvicorn.workers.UvicornWorker -b :$PORT -w 4 --access-logfile=/var/lib/text-pair/api_server/access.log --error-logfile=/var/lib/text-pair/api_server/error.log --chdir /var/lib/text-pair/api/ text_pair:app
 fi

docker_autostart.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 # Copied to docker container and run as command
 
-if [ ! -d "/data/psql_data" ]; then
-su postgres <<'EOF'
-service postgresql start
-psql -c "create database textpair"
-psql -d textpair -c "create extension pg_trgm;"
-psql -c "create role textpair with login password 'textpair';"
-psql -c "GRANT ALL PRIVILEGES ON database textpair to textpair;"
-EOF
-perl -pi -e 's/^(local.*)peer$/$1 md5/;' /etc/postgresql/14/main/pg_hba.conf
+# if [ ! -d "/data/psql_data" ]; then
+# su postgres <<'EOF'
+# service postgresql start
+# psql -c "create database textpair"
+# psql -d textpair -c "create extension pg_trgm;"
+# psql -c "create role textpair with login password 'textpair';"
+# psql -c "GRANT ALL PRIVILEGES ON database textpair to textpair;"
+# EOF
+# perl -pi -e 's/^(local.*)peer$/$1 md5/;' /etc/postgresql/14/main/pg_hba.conf
 su postgres <<'EOF'
 service postgresql restart
 EOF

lib/setup.py

@@ -15,7 +15,7 @@
     "sentence-transformers",
     "lz4",
     "orjson",
-    "text_preprocessing @ git+https://github.com/ARTFL-Project/text-preprocessing@v1.0.5#egg=text_preprocessing",
+    "text_preprocessing @ git+https://github.com/ARTFL-Project/text-preprocessing@v1.1.0.1#egg=text_preprocessing",
     "fastapi==0.110.3",
     "psycopg2",
     "gunicorn",