diff --git a/Dockerfile b/Dockerfile
index 4afa4d95..e0dd6ae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,13 @@
-FROM mysql:mysql-server
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get install -y python python-pip
+RUN apt-get install -y mysql-server-5.7
+RUN apt-get install -y mysql-client-core-5.7
+RUN apt-get install -y mysql-client-5.7
+RUN apt-get install -y libmysqlclient-dev
 
-FROM python:2.7-wheezy
 ADD ./librarian
 WORKDIR ./librarian
+
 RUN pip install -r requirements.txt
-CMD ["python", "run.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 9655a133..afb9c0a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,14 @@
 version: '2'
 services:
-  web:
-    build: .
-    ports:
-      - "80:7070"
-    volumes:
-      - .:/librarian
   db:
     image: "mysql:5.7"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
     ports:
       - "3306:3306"
+  web:
+    build: .
+    ports:
+      - "80:7070"
+    volumes:
+      - .:/librarian