diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..2cbd8cc
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,33 @@
+version: '2'
+
+services:
+
+  app:
+    build: docker/app
+    environment:
+       - VIRTUAL_HOST=communote.de
+       - VIRTUAL_PORT=8080
+    networks:
+      - communote
+      - public
+    depends_on:
+      - db
+
+  db:
+     image: postgres:9.1.23
+     expose:
+       - 3306
+     volumes:
+       - ./docker/pgsql/data:/var/lib/mysql:rw
+     environment:
+       - POSTGRES_PASSWORD=1234
+       - POSTGRES_DB=communote
+     networks:
+       - communote
+
+networks:
+  communote:
+    driver: bridge
+  public:
+    external:
+      name: public
\ No newline at end of file
diff --git a/docker/app/Communote-3.4.0.7b5d-linux.tar.gz b/docker/app/Communote-3.4.0.7b5d-linux.tar.gz
new file mode 100644
index 0000000..81c69cb
Binary files /dev/null and b/docker/app/Communote-3.4.0.7b5d-linux.tar.gz differ
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
new file mode 100644
index 0000000..39b62f6
--- /dev/null
+++ b/docker/app/Dockerfile
@@ -0,0 +1,11 @@
+FROM tomcat
+
+ADD Communote-3.4.0.7b5d-linux.tar.gz /
+RUN mv /Communote-3.4.0.7b5d /app
+ADD context.xml /app/communote/conf/context.xml
+RUN mkdir /communote-data
+ADD startup.properties /app/communote/conf/communote/
+
+ENV CATALINA_HOME=/app/communote/
+
+CMD /app/communote/bin/startup.sh && /bin/bash -c "sleep inf"
\ No newline at end of file
diff --git a/docker/app/context.xml b/docker/app/context.xml
new file mode 100644
index 0000000..1e56579
--- /dev/null
+++ b/docker/app/context.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!-- The contents of this file will be loaded for each web application -->
+<Context privileged="true" useHttpOnly="true">
+    <!-- Default set of monitored resources -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+    <Manager pathname="" />
+
+    <Environment name="communote.instance.name" type="java.lang.String" value="communote" />
+    <Environment name="communote.config.dir" type="java.lang.String" value="/app/communote/conf/communote" />
+</Context>
\ No newline at end of file
diff --git a/docker/app/startup.properties b/docker/app/startup.properties
new file mode 100644
index 0000000..c2bfa20
--- /dev/null
+++ b/docker/app/startup.properties
@@ -0,0 +1 @@
+communote.data.dir=/communote-data
\ No newline at end of file