add production docker files, update readme, bump dependencies

Author: mjhea0

.env-sample

@@ -0,0 +1,9 @@
+DEBUG=0
+SECRET_KEY=change_me
+SQL_ENGINE=django.db.backends.postgresql
+SQL_DATABASE=hello_django_prod
+SQL_USER=hello_django
+SQL_PASSWORD=hello_django
+SQL_HOST=db
+SQL_PORT=5432
+DATABASE=postgres

.env.db-sample

@@ -0,0 +1,3 @@
+POSTGRES_USER=hello_django
+POSTGRES_PASSWORD=hello_django
+POSTGRES_DB=hello_django_prod

.gitignore

@@ -1,3 +1,5 @@
 *.pyc
 __pycache
 .DS_Store
+.env
+.env.db

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Michael Herman
+Copyright (c) 2019 Michael Herman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,24 +6,28 @@ Check out the [post](https://testdriven.io/dockerizing-django-with-postgres-guni
 
 ## Want to use this project?
 
-1. Fork/Clone
+### Development
 
-1. Build the images and run the containers:
+Uses the default Django development server.
 
-    - development (django default server):
+1. Update the environment variables in the *docker-compose.yml* file.
+1. Build the images and run the containers:
 
     ```sh
     $ docker-compose up -d --build
     ```
-    Test it out at [http://localhost:8000](http://localhost:8000)
 
-    App's folder is mounted into container and your changes apply automatically.
+    Test it out at [http://localhost:8000](http://localhost:8000). The "app" folder is mounted into the container and your code changes apply automatically.
+
+### Production
 
-    - production (gunicorn + nginx):
+Uses gunicorn + nginx.
+
+1. Rename *.env-sample* to *.env* and *.env.db-sample* to *.env.db*. Update the environment variables.
+1. Build the images and run the containers:
 
     ```sh
-    $ docker-compose -f docker-compose.prod.yml up --build -d
+    $ docker-compose -f docker-compose.prod.yml up -d --build
     ```
-    No mounted folders -- to apply changes container should be rebuilt
 
-    Test it out at [http://localhost:1337](http://localhost:1337)
+    Test it out at [http://localhost:1337](http://localhost:1337). No mounted folders. To apply changes, the image must be re-built.

app/Dockerfile

@@ -1,13 +1,13 @@
 # pull official base image
 FROM python:3.7-alpine
 
+# set work directory
+WORKDIR /usr/src/app
+
 # set environment varibles
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-# set work directory
-WORKDIR /usr/src/app
-
 # install psycopg2
 RUN apk update \
     && apk add --virtual build-deps gcc python3-dev musl-dev \

app/Dockerfile.prod

@@ -0,0 +1,31 @@
+# pull official base image
+FROM python:3.7-alpine
+
+# set work directory
+WORKDIR /usr/src/app
+
+# set environment varibles
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+# install psycopg2
+RUN apk update \
+    && apk add --virtual build-deps gcc python3-dev musl-dev \
+    && apk add postgresql-dev \
+    && pip install psycopg2 \
+    && apk del build-deps
+
+# install dependencies
+RUN pip install --upgrade pip
+RUN pip install pipenv
+COPY ./Pipfile /usr/src/app/Pipfile
+RUN pipenv install --skip-lock --system
+
+# copy entrypoint-prod.sh
+COPY ./entrypoint.prod.sh /usr/src/app/entrypoint.prod.sh
+
+# copy project
+COPY . /usr/src/app/
+
+# run entrypoint.prod.sh
+ENTRYPOINT ["/usr/src/app/entrypoint.prod.sh"]

app/Pipfile

@@ -7,7 +7,7 @@ name = "pypi"
 
 [packages]
 
-django= "==2.1"
+django = "==2.2"
 gunicorn= "==19.9.0"
 
 

app/Pipfile.lock

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "$DATABASE" = "postgres" ]
+then
+    echo "Waiting for postgres..."
+
+    while ! nc -z $SQL_HOST $SQL_PORT; do
+      sleep 0.1
+    done
+
+    echo "PostgreSQL started"
+fi
+
+exec "$@"