Skip to content

Commit 90048df

Browse files
authored
Remove postgresql from the conda environment (#246)
* remove postgresql from the conda environment, only psycopg2 is needed for DB access * use psycopg2 instead of psql to check if DB is up
1 parent 1bed4fb commit 90048df

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

conda_environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ dependencies:
88
- gunicorn
99
- make
1010
- oauthlib
11-
- postgresql
1211
- psycopg2-binary=2.9.3
1312
- psutil
1413
- python-ldap>=3.1

src/dasmon_app/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
# wait for postgress to be available
5-
until PGPASSWORD=${DATABASE_PASS} psql -h "${DATABASE_HOST}" -U "${DATABASE_USER}" -d "${DATABASE_NAME}" -c '\q'; do
5+
until python -c "import psycopg2; import os; psycopg2.connect(host=os.environ['DATABASE_HOST'], dbname=os.environ['DATABASE_NAME'], user=os.environ['DATABASE_USER'], password=os.environ['DATABASE_PASS']).close()"; do
66
>&2 echo "Postgres is unavailable - sleeping"
77
sleep 1
88
done

src/webmon_app/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
MANAGE_PY_WEBMON="/opt/conda/lib/python3.11/site-packages/reporting/manage.py"
55

66
# wait for postgress to be available
7-
until PGPASSWORD=${DATABASE_PASS} psql -h "${DATABASE_HOST}" -U "${DATABASE_USER}" -d "${DATABASE_NAME}" -c '\q'; do
7+
until python -c "import psycopg2; import os; psycopg2.connect(host=os.environ['DATABASE_HOST'], dbname=os.environ['DATABASE_NAME'], user=os.environ['DATABASE_USER'], password=os.environ['DATABASE_PASS']).close()"; do
88
>&2 echo "Postgres is unavailable - sleeping"
99
sleep 1
1010
done

src/workflow_app/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
# wait for postgress to be available
5-
until PGPASSWORD=${DATABASE_PASS} psql -h "${DATABASE_HOST}" -U "${DATABASE_USER}" -d "${DATABASE_NAME}" -c '\q'; do
5+
until python -c "import psycopg2; import os; psycopg2.connect(host=os.environ['DATABASE_HOST'], dbname=os.environ['DATABASE_NAME'], user=os.environ['DATABASE_USER'], password=os.environ['DATABASE_PASS']).close()"; do
66
>&2 echo "Postgres is unavailable - sleeping"
77
sleep 1
88
done

0 commit comments

Comments
 (0)