diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..33aa1ed
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+.gitignore
+.git
+*.md
+*.txt
+Dockerfile
+Makefile
+setup.cfg
+env
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 969c5b1..0334d55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,12 @@
-FROM ubuntu:15.04
+# This is just for functional testing. We install scikit-image just as a convenient way to view images. Many other
+# packages could easily accomplish this.
+
+FROM debian:latest
 MAINTAINER Jim Rybarski <jim@rybarski.com>
 
 RUN mkdir -p /var/nds2
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
-    libatlas3-base \
     liblapack-dev \
     libblas-dev \
     python \
@@ -12,7 +14,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python-dev \
     python3-dev \
     python-pip \
-    python3-pip
+    python3-pip \
+    libfreetype6-dev \
+    python3-matplotlib \
+    libfreetype6-dev \
+    libpng-dev \
+    libjpeg-dev \
+    pkg-config \
+    python3-skimage \
+ && pip3 install -U cython \
+    scikit-image \
+ && rm -rf /var/lib/apt/lists/*
 
 COPY . /opt/nd2reader
 WORKDIR /opt/nd2reader