fix issues (#457)

ohcnetwork · Feb 1, 2024 · c2308a1 · c2308a1
1 parent 84ce1c6
commit c2308a1
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 77 deletions.
diff --git a/Pipfile b/Pipfile
@@ -8,6 +8,7 @@ pillow = "==10.0.0"
 argon2-cffi = "==23.1.0"
 whitenoise = "==6.6.0"
 redis = "==5.0.1"
+beautifulsoup4 = "==4.12.3"
 celery = "==5.3.6"
 django = "==4.2.6"
 djangoql = "==0.17.1"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile
@@ -8,6 +8,8 @@ FROM python as python-build-stage
 
 ARG BUILD_ENVIRONMENT=local
 
+ENV PATH /venv/bin:$PATH
+
 # Install apt packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages

diff --git a/compose/production/django/Dockerfile b/compose/production/django/Dockerfile
@@ -8,6 +8,8 @@ FROM python as python-build-stage
 
 ARG BUILD_ENVIRONMENT=production
 
+ENV PATH /venv/bin:$PATH
+
 # Install apt packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages

diff --git a/compose/production/django/entrypoint b/compose/production/django/entrypoint
@@ -20,17 +20,12 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 
 try:
-    psycopg2.connect(
-        dbname="${POSTGRES_DB}",
-        user="${POSTGRES_USER}",
-        password="${POSTGRES_PASSWORD}",
-        host="${POSTGRES_HOST}",
-        port="${POSTGRES_PORT}",
-    )
-except psycopg2.OperationalError:
+    psycopg.connect(conninfo="${DATABASE_URL}")
+except psycopg.OperationalError as e:
+    print(e)
     sys.exit(-1)
 sys.exit(0)
 

diff --git a/compose/production/django/start b/compose/production/django/start
@@ -10,4 +10,4 @@ fi
 
 python /app/manage.py collectstatic --noinput
 python /app/manage.py migrate
-/usr/local/bin/gunicorn core.wsgi --bind 0.0.0.0:5000 --timeout 180 --chdir=/app
+gunicorn core.wsgi --bind 0.0.0.0:5000 --timeout 180 --chdir=/app