Merge ~hloeung/charm-k8s-content-cache/+git/content-cache-k8s-image-builder:master into ~hloeung/charm-k8s-content-cache:master

[Haw Loeung]

diff --git a/.gitignore b/.gitignore
index 9f65e64..5ea2462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 *~
+<<<<<<< .gitignore
 *.charm
 .coverage
 .tox
 build/
 __pycache__/
+=======
+>>>>>>> .gitignore
diff --git a/README.md b/README.md
index aabaf43..bc57c70 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< README.md
 # charm-k8s-content-cache
 
 ## Description
@@ -26,3 +27,6 @@ and install the development requirements,
 Just run `run_tests`:
 
     ./run_tests
+=======
+# Content Cache Docker
+>>>>>>> README.md
diff --git a/docker/Dockerfile b/docker/Dockerfile
 new file mode 100644
index 0000000..1d9ebed
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:focal
+
+# We use "set -o pipefail"
+SHELL ["/bin/bash", "-c"]
+
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get -qy update && \
+    apt-get -qy dist-upgrade --no-install-recommends && \
+    apt-get -qy install --no-install-recommends nginx && \
+    rm -f /var/lib/apt/lists/*_*