diff --git a/.gitignore b/.gitignore
index 43d3c5c..1db9d73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,4 +96,7 @@ ENV/
 .ropeproject
 
 # Not my config file
-nilsbot.json
\ No newline at end of file
+nilsbot.json
+
+# data directory for docker
+dockerdata/
diff --git a/Dockerfile b/Dockerfile
index 29857c7..5cbefff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM debian:buster-slim
+#FROM debian:buster-slim
+FROM ubuntu:17.10
 
-LABEL maintainer="Till Witt <witt@consider-it.de>""
+LABEL maintainer="Till Witt <witt@consider-it.de>"
 
 RUN apt-get update && \
     apt-get -y install python2.7 python-pip libmariadbclient-dev && \
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..1b16901
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,33 @@
+#docker exec -it mindchains_enodeserver /bin/bash
+
+version: '3.1'
+services:
+  pytweetbot:
+    build: .
+    container_name: pytweetbot
+    stdin_open: true
+    volumes:
+        - .:/app
+    links:
+        - db
+
+  db:
+    image: mariadb
+    environment:
+        - MYSQL_ROOT_PASSWORD=pytb
+        - MYSQL_DATABASE=pytb
+    volumes:
+        - ./dockerdata/database:/var/lib/mysql
+
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    environment:
+        - PMA_HOST=db
+    restart: always
+    ports:
+        - 80:80
+    volumes:
+        - /sessions
+    links:
+        - db