fix django

Author: sgnd

Dockerfile

@@ -6,9 +6,11 @@ WORKDIR /app
 COPY --chown=app:app ./requirements.txt /app/
 RUN pip install -r /app/requirements.txt; \
     mkdir -p /app/static; \
-    chown -R app:app /app/static
+    chown -R app:app /app/static; \
+    apt update; \
+    apt install -y --no-install-recommends postgresql-client
 COPY --chown=app:app . /app/
 ENV DEBUG=True
 USER app
 EXPOSE 8000
-CMD [ "./manage.py", "runserver", "0.0.0.0:8000" ]
+CMD [ "bash", "entrypoint.sh" ]

README.md

@@ -10,8 +10,6 @@ This is a hello world app that is written in [Python](https://www.python.org/),
 
 ```bash
 $ git clone repo
-$ docker-compose up -d db
-$ docker-compose run app python manage.py migrate
 $ docker-compose up --build
 ```
 

docker-compose.yml

@@ -25,8 +25,8 @@ services:
     environment:
       - POSTGRES_USER=app
       - POSTGRES_PASSWORD=app
-    ports:
-      - 5432:5432
+    # ports:
+    #   - 5432:5432
     volumes:
       - db-data:/var/lib/postgresql/data
 

entrypoint.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Check if database is ready
+while ! pg_isready -q -h ${POSTGRES_HOST:-postgres} -p ${POSTGRES_PORT:-5432} -U ${POSTGRES_USER:-postgres}; do
+    echo "Waiting for database connection..."
+    sleep 1
+done
+
+if [ -z "${SKIP_MIGRATION}" ]; then
+    python manage.py migrate --noinput
+fi
+
+if [ -z "${SKIP_COLLECTSTATIC}" ]; then
+    python manage.py collectstatic --noinput
+fi
+
+if [ -z "${USE_WSGI}" ]; then
+    exec python manage.py runserver 0.0.0.0:${PORT:-8000}
+else
+    exec gunicorn --bind 0.0.0.0:${PORT:-8000} hello_world.wsgi:application
+fi