diff --git a/.dockerignore b/.dockerignore
index 331d387..ae61f74 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,7 @@
 .git
+.gitignore
 Dockerfile
+docker-compose.yml
+LICENSE
+*.md
+yotter-config.json
diff --git a/Dockerfile b/Dockerfile
index de211b8..a09eafd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,10 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 
 RUN flask db init \
-  && flask db migrate\
+  && flask db migrate \
   && flask db upgrade
 
-CMD [ "gunicorn", "-b", "0.0.0.0:5000", "-w", "4", "yotter:app" ]
+CMD flask db upgrade \
+  && gunicorn -b 0.0.0.0:5000 -w 4 yotter:app
+
 EXPOSE 5000
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..44c391f
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '3.4'
+services:
+  mariadb:
+    image: mariadb:latest
+    environment:
+      MYSQL_ROOT_PASSWORD: changeme
+      MYSQL_DATABASE: yotter
+      MYSQL_USER: yotter
+      MYSQL_PASSWORD: changeme
+    restart: on-failure
+    volumes:
+     - /var/lib/mysql
+    healthcheck:
+     test: ["CMD", "mysqladmin", "ping", "--silent"]
+  yotter:
+    image: yotter
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:5000:5000"
+    environment:
+      DATABASE_URL: mysql+pymysql://yotter:changeme@mariadb:3306/yotter
+    depends_on:
+      - mariadb
+    ports:
+      - "5000:5000"
+    volumes:
+     - /usr/src/app/migrations
+     - ./yotter-config.json:/usr/src/app/yotter-config.json