diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..fbbc841
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+
+FROM tomcat:8.0-jre8-alpine
+WORKDIR /usr/local/tomcat
+COPY target/app.war /usr/local/tomcat/webapps/app.war
+EXPOSE 8080
+CMD ["catalina.sh", "run"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..dde2dff
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,35 @@
+version: "2"
+
+---
+volumes:
+  postgresql-data:
+    driver: local
+  springframework-data:
+    driver: local
+
+
+---
+services:
+  db:
+    image: postgres:9.1
+    ports:
+    - 5433:5432
+    volumes:
+    - postgresql-data:/var/lib/postgresql/data
+    env_file:
+    - dev.env
+  web:
+    image: your_image_name_here:latest
+    build:
+      context: "."
+      dockerfile: dev.Dockerfile
+    command: catalina.sh run
+    ports:
+    - 8080:8080
+    working_dir: "/usr/local/tomcat"
+    stdin_open: true
+    tty: true
+    links:
+    - db
+    depends_on:
+    - db