Merge pull request testdrivenio#13 from testdrivenio/update

remove pipenv, add multi-stage build, and upgrade to python 3.8

Author: mjhea0

.env.dev-sample

@@ -0,0 +1,10 @@
+DEBUG=1
+SECRET_KEY=foo
+DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
+SQL_ENGINE=django.db.backends.postgresql
+SQL_DATABASE=hello_django_dev
+SQL_USER=hello_django
+SQL_PASSWORD=hello_django
+SQL_HOST=db
+SQL_PORT=5432
+DATABASE=postgres

.env-sample renamed to .env.prod-sample

@@ -1,5 +1,6 @@
 DEBUG=0
 SECRET_KEY=change_me
+DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
 SQL_ENGINE=django.db.backends.postgresql
 SQL_DATABASE=hello_django_prod
 SQL_USER=hello_django

.env.db-sample renamed to .env.prod.db-sample

@@ -1,5 +1,6 @@
 *.pyc
 __pycache
 .DS_Store
-.env
-.env.db
+.env.dev
+.env.prod
+.env.prod.db

.gitignore

@@ -10,7 +10,8 @@ Check out the [post](https://testdriven.io/dockerizing-django-with-postgres-guni
 
 Uses the default Django development server.
 
-1. Update the environment variables in the *docker-compose.yml* file.
+1. Rename *.env.dev-sample* to *.env.dev*.
+1. Update the environment variables in the *docker-compose.yml* and *.env.dev* files.
 1. Build the images and run the containers:
 
  ```sh
@@ -23,7 +24,7 @@ Uses the default Django development server.
 
 Uses gunicorn + nginx.
 
-1. Rename *.env-sample* to *.env* and *.env.db-sample* to *.env.db*. Update the environment variables.
+1. Rename *.env.prod-sample* to *.env.prod* and *.env.prod.db-sample* to *.env.prod.db*. Update the environment variables.
 1. Build the images and run the containers:
 
  ```sh

README.md

@@ -1,5 +1,5 @@
 # pull official base image
-FROM python:3.7.4-alpine
+FROM python:3.8.0-alpine
 
 # set work directory
 WORKDIR /usr/src/app
@@ -8,18 +8,14 @@ WORKDIR /usr/src/app
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-# install psycopg2
+# install psycopg2 dependencies
 RUN apk update \
- && apk add --virtual build-deps gcc python3-dev musl-dev \
- && apk add postgresql-dev \
- && pip install psycopg2 \
- && apk del build-deps
+ && apk add postgresql-dev gcc python3-dev musl-dev
 
 # install dependencies
 RUN pip install --upgrade pip
-RUN pip install pipenv
-COPY ./Pipfile /usr/src/app/Pipfile
-RUN pipenv install --skip-lock --system --dev
+COPY ./requirements.txt /usr/src/app/requirements.txt
+RUN pip install -r requirements.txt
 
 # copy entrypoint.sh
 COPY ./entrypoint.sh /usr/src/app/entrypoint.sh

app/Dockerfile

@@ -1,5 +1,9 @@
+###########
+# BUILDER #
+###########
+
 # pull official base image
-FROM python:3.7.4-alpine
+FROM python:3.8.0-alpine as builder
 
 # set work directory
 WORKDIR /usr/src/app
@@ -8,24 +12,57 @@ WORKDIR /usr/src/app
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-# install psycopg2
+# install psycopg2 dependencies
 RUN apk update \
- && apk add --virtual build-deps gcc python3-dev musl-dev \
- && apk add postgresql-dev \
- && pip install psycopg2 \
- && apk del build-deps
+ && apk add postgresql-dev gcc python3-dev musl-dev
 
-# install dependencies
+# lint
 RUN pip install --upgrade pip
-RUN pip install pipenv
-COPY ./Pipfile /usr/src/app/Pipfile
-RUN pipenv install --skip-lock --system
+RUN pip install flake8
+COPY . /usr/src/app/
+RUN flake8 --ignore=E501,F401 .
+
+# install dependencies
+COPY ./requirements.txt .
+RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
+
+
+#########
+# FINAL #
+#########
+
+# pull official base image
+FROM python:3.8.0-alpine
+
+# create directory for the app user
+RUN mkdir -p /home/app
+
+# create the app user
+RUN addgroup -S app && adduser -S app -G app
+
+# create the home directory
+ENV HOME=/home/app
+ENV APP_HOME=/home/app/web
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+# install dependencies
+RUN apk update && apk add libpq
+COPY --from=builder /usr/src/app/wheels /wheels
+COPY --from=builder /usr/src/app/requirements.txt .
+RUN pip install --no-cache /wheels/*
 
 # copy entrypoint-prod.sh
-COPY ./entrypoint.prod.sh /usr/src/app/entrypoint.prod.sh
+COPY ./entrypoint.prod.sh $APP_HOME
 
 # copy project
-COPY . /usr/src/app/
+COPY . $APP_HOME
+
+# chown all the files to the app user
+RUN chown -R app:app $APP_HOME
+
+# change to the app user
+USER app
 
 # run entrypoint.prod.sh
-ENTRYPOINT ["/usr/src/app/entrypoint.prod.sh"]
+ENTRYPOINT ["/home/app/web/entrypoint.prod.sh"]

app/Dockerfile.prod

@@ -1,7 +1,7 @@
 """
 Django settings for hello_django project.
 
-Generated by 'django-admin startproject' using Django 2.2.4.
+Generated by 'django-admin startproject' using Django 2.2.6.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/2.2/topics/settings/
@@ -19,24 +19,26 @@
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
 
-SECRET_KEY = os.environ.get('SECRET_KEY')
+SECRET_KEY = os.environ.get("SECRET_KEY")
 
-DEBUG = int(os.environ.get('DEBUG', default=0))
+DEBUG = int(os.environ.get("DEBUG", default=0))
 
-ALLOWED_HOSTS = ['localhost', '127.0.0.1']
+# 'DJANGO_ALLOWED_HOSTS' should be a single string of hosts with a space between each.
+# For example: 'DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]'
+ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS").split(" ")
 
 
 # Application definition
 
 INSTALLED_APPS = [
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
-
- 'upload',
+ "django.contrib.admin",
+ "django.contrib.auth",
+ "django.contrib.contenttypes",
+ "django.contrib.sessions",
+ "django.contrib.messages",
+ "django.contrib.staticfiles",
+
+ "upload",
 ]
 
 MIDDLEWARE = [
@@ -74,13 +76,13 @@
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
 DATABASES = {
- 'default': {
- 'ENGINE': os.environ.get('SQL_ENGINE', 'django.db.backends.sqlite3'),
- 'NAME': os.environ.get('SQL_DATABASE', os.path.join(BASE_DIR, 'db.sqlite3')),
- 'USER': os.environ.get('SQL_USER', 'user'),
- 'PASSWORD': os.environ.get('SQL_PASSWORD', 'password'),
- 'HOST': os.environ.get('SQL_HOST', 'localhost'),
- 'PORT': os.environ.get('SQL_PORT', '5432'),
+ "default": {
+ "ENGINE": os.environ.get("SQL_ENGINE", "django.db.backends.sqlite3"),
+ "NAME": os.environ.get("SQL_DATABASE", os.path.join(BASE_DIR, "db.sqlite3")),
+ "USER": os.environ.get("SQL_USER", "user"),
+ "PASSWORD": os.environ.get("SQL_PASSWORD", "password"),
+ "HOST": os.environ.get("SQL_HOST", "localhost"),
+ "PORT": os.environ.get("SQL_PORT", "5432"),
  }
 }
 
@@ -121,8 +123,8 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
-STATIC_URL = '/staticfiles/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
+STATIC_URL = "/staticfiles/"
+STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
 
-MEDIA_URL = '/mediafiles/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles')
+MEDIA_URL = "/mediafiles/"
+MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles")