From dc66d7506d6d1da092a213e511ff2ac804cf7b24 Mon Sep 17 00:00:00 2001
From: Nicolas Giard <github@ngpixel.com>
Date: Tue, 13 Dec 2022 17:50:28 -0500
Subject: [PATCH] ci: use pgdb service container

---
 docker/scripts/db-pg-migrate.sh | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/docker/scripts/db-pg-migrate.sh b/docker/scripts/db-pg-migrate.sh
index 480b64209..d843e0094 100644
--- a/docker/scripts/db-pg-migrate.sh
+++ b/docker/scripts/db-pg-migrate.sh
@@ -10,19 +10,6 @@ echo "Creating data directories..."
 chmod +x ./docker/scripts/app-create-dirs.sh
 ./docker/scripts/app-create-dirs.sh
 
-mkdir -p /pgdata
-chmod -R 777 /pgdata
-
-# Setup pg database container
-echo "Setting up PostgreSQL DB container..."
-docker run -d --name pgdb -p 5432:5432 \
-    -e POSTGRES_PASSWORD=RkTkDPFnKpko \
-    -e POSTGRES_USER=django \
-    -e POSTGRES_DB=ietf \
-    -e POSTGRES_HOST_AUTH_METHOD=trust \
-    -v /pgdata:/var/lib/postgresql/data \
-    postgres:14.5
-
 # Add Postgresql Apt Repository to get 14    
 echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
 wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
@@ -30,17 +17,20 @@ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key a
 # Install pg client and pgloader
 apt-get update
 apt-get install -y --no-install-recommends postgresql-client-14 pgloader
+    
+# Wait for DB containers
+echo "Waiting for DB containers to come online..."
+/usr/local/bin/wait-for db:3306 -- echo "MariaDB ready"
+/usr/local/bin/wait-for pgdb:5432 -- echo "PostgreSQL ready"
+
+# Alter search path
+pgdb psql -U django -h pgdb -d ietf -v ON_ERROR_STOP=1 -c '\x' -c 'ALTER USER django set search_path=ietf_utf8,django,public;'
 
 # Copy settings files
 cp ./docker/configs/settings_local.py ./ietf/settings_local.py
 cp ./docker/configs/settings_mysqldb.py ./ietf/settings_mysqldb.py
 cp ./docker/configs/settings_postgresqldb.py ./ietf/settings_postgresqldb.py
 
-# Wait for DB containers
-echo "Waiting for DB containers to come online..."
-/usr/local/bin/wait-for db:3306 -- echo "MariaDB ready"
-/usr/local/bin/wait-for pgdb:5432 -- echo "Postgresql ready"
-
 # Initial checks
 echo "Running initial checks..."
 /usr/local/bin/python ./ietf/manage.py check --settings=settings_local
@@ -74,8 +64,4 @@ else
     echo ${EMPTY_CHECK}
 fi
 
-# Stop postgreSQL container
-echo "Stopping PostgreSQL container..."
-docker stop pgdb
-
 echo "Done."