diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..57da962
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,11 @@
+node_modules
+npm-debug.log
+Dockerfile*
+docker-compose*
+.dockerignore
+.git
+.gitignore
+README.md
+LICENSE
+.vscode
+env
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..655c009
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+# Pull a pre-built alpine docker image with nginx and python3 installed
+FROM tiangolo/uwsgi-nginx:python3.6-alpine3.7
+
+# Set the port on which the app runs; make both values the same.
+#
+# IMPORTANT: When deploying to Azure App Service, go to the App Service on the Azure 
+# portal, navigate to the Applications Settings blade, and create a setting named
+# WEBSITES_PORT with a value that matches the port here (the Azure default is 80).
+# You can also create a setting through the App Service Extension in VS Code.
+ENV LISTEN_PORT=8000
+EXPOSE 8000
+
+# Indicate where uwsgi.ini lives
+ENV UWSGI_INI uwsgi.ini
+
+# Tell nginx where static files live. Typically, developers place static files for
+# multiple apps in a shared folder, but for the purposes here we can use the one
+# app's folder. Note that when multiple apps share a folder, you should create subfolders
+# with the same name as the app underneath "static" so there aren't any collisions
+# when all those static files are collected together, as when using Django's
+# collectstatic command.
+ENV STATIC_URL /app/static_collected
+
+# Copy the app files to a folder and run it from there
+WORKDIR /app
+ADD . /app
+
+# Make app folder writeable for the sake of db.sqlite3, and make that file also writeable.
+# Ideally you host the database somewhere else so that the app folders can remain read only.
+# Without these permissions you see the errors "unable to open database file" and
+# "attempt to write to a readonly database", respectively, whenever the app attempts to
+# write to the database.
+RUN chmod g+w /app
+RUN chmod g+w /app/db.sqlite3
+
+# Make sure dependencies are installed
+RUN python3 -m pip install -r requirements.txt
diff --git a/README.md b/README.md
index 48bdf12..1449a18 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 This sample contains the completed program from the tutorial, [Using Django in Visual Studio Code](https://code.visualstudio.com/docs/python/tutorial-django). Intermediate steps are not included.
 
+The sample also includes a Dockerfile to build a production-ready container image that uses uwsgi and nginx; the uwsgi.ini file provides uwsgi configuration.
+
 To run the sample:
 
 1. Create a virtual environment as described in the tutorial.
diff --git a/uwsgi.ini b/uwsgi.ini
new file mode 100644
index 0000000..fdff29b
--- /dev/null
+++ b/uwsgi.ini
@@ -0,0 +1,8 @@
+[uwsgi]
+chdir = .
+module = web_project.wsgi:application
+env = DJANGO_SETTINGS_MODULE=web_project.settings
+uid = 1000
+master = true
+threads = 2
+processes = 4
diff --git a/web_project/settings.py b/web_project/settings.py
index e42f6c7..510c991 100644
--- a/web_project/settings.py
+++ b/web_project/settings.py
@@ -23,8 +23,12 @@
 SECRET_KEY = '2gult1d96#@#b2%tz+k9x1q%-4(%f@va-!sbv*q&$t^gpp8-_='
 
 # SECURITY WARNING: don't run with debug turned on in production!
+# If you set to False, also add "localhost" to ALLOWED_HOSTS or else
+# you'll get "Bad Request" when running locally.
 DEBUG = True
 
+# When deploying to Azure App Service, add you <name>.azurewebsites.net 
+# domain to ALLOWED_HOSTS; you get an error message if you forget.
 ALLOWED_HOSTS = []