updates june 2020

Author: mjhea0

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Michael Herman
+Copyright (c) 2020 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

app/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM python:3.8.0-alpine
+FROM python:3.8.3-alpine
 
 # set work directory
 WORKDIR /usr/src/app
@@ -14,14 +14,14 @@ RUN apk update \
 
 # install dependencies
 RUN pip install --upgrade pip
-COPY ./requirements.txt /usr/src/app/requirements.txt
+COPY ./requirements.txt .
 RUN pip install -r requirements.txt
 
 # copy entrypoint.sh
-COPY ./entrypoint.sh /usr/src/app/entrypoint.sh
+COPY ./entrypoint.sh .
 
 # copy project
-COPY . /usr/src/app/
+COPY . .
 
 # run entrypoint.sh
 ENTRYPOINT ["/usr/src/app/entrypoint.sh"]

app/Dockerfile.prod

@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM python:3.8.0-alpine as builder
+FROM python:3.8.3-alpine as builder
 
 # set work directory
 WORKDIR /usr/src/app
@@ -19,7 +19,7 @@ RUN apk update \
 # lint
 RUN pip install --upgrade pip
 RUN pip install flake8
-COPY . /usr/src/app/
+COPY . .
 RUN flake8 --ignore=E501,F401 .
 
 # install dependencies
@@ -32,7 +32,7 @@ RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requir
 #########
 
 # pull official base image
-FROM python:3.8.0-alpine
+FROM python:3.8.3-alpine
 
 # create directory for the app user
 RUN mkdir -p /home/app
@@ -52,7 +52,6 @@ WORKDIR $APP_HOME
 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 --upgrade pip
 RUN pip install --no-cache /wheels/*
 
 # copy entrypoint-prod.sh

app/entrypoint.sh

@@ -13,6 +13,5 @@ fi
 
 python manage.py flush --no-input
 python manage.py migrate
-python manage.py collectstatic --no-input --clear
 
 exec "$@"

app/hello_django/asgi.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for hello_django project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/3.0/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'hello_django.settings')
+
+application = get_asgi_application()

app/hello_django/settings.py

@@ -1,13 +1,13 @@
 """
 Django settings for hello_django project.
 
-Generated by 'django-admin startproject' using Django 2.2.6.
+Generated by 'django-admin startproject' using Django 3.0.5.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.2/topics/settings/
+https://docs.djangoproject.com/en/3.0/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/2.2/ref/settings/
+https://docs.djangoproject.com/en/3.0/ref/settings/
 """
 
 import os
@@ -17,7 +17,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 SECRET_KEY = os.environ.get("SECRET_KEY")
 
@@ -73,7 +73,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
+# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
 DATABASES = {
     "default": {
@@ -88,7 +88,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -107,7 +107,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/2.2/topics/i18n/
+# https://docs.djangoproject.com/en/3.0/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -121,7 +121,7 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/2.2/howto/static-files/
+# https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 STATIC_URL = "/staticfiles/"
 STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")

app/hello_django/wsgi.py

@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/
 """
 
 import os

app/requirements.txt

@@ -1,3 +1,3 @@
-Django==2.2.6
-gunicorn==19.9.0
-psycopg2-binary==2.8.3
+Django==3.0.7
+gunicorn==20.0.4
+psycopg2-binary==2.8.5

nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.17.4-alpine
+FROM nginx:1.19.0-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d