From 8dd3a03cb514199bb5186c0c12da59f7e4ff8844 Mon Sep 17 00:00:00 2001
From: Ishmael <32338445+ishmaelthehunter@users.noreply.github.com>
Date: Tue, 26 Dec 2017 12:03:54 -0600
Subject: [PATCH 1/3] Dockerfile

---
 DockerFile | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 DockerFile

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"]

From 2ee433fe9a37cc52f412698f91d73b9f75543512 Mon Sep 17 00:00:00 2001
From: Ishmael <32338445+ishmaelthehunter@users.noreply.github.com>
Date: Tue, 26 Dec 2017 12:05:03 -0600
Subject: [PATCH 2/3] Rename DockerFile to Dockerfile

---
 DockerFile => Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename DockerFile => Dockerfile (100%)

diff --git a/DockerFile b/Dockerfile
similarity index 100%
rename from DockerFile
rename to Dockerfile

From f01a44447914aa0a21a3b8c9f8c02cf09c43361f Mon Sep 17 00:00:00 2001
From: Ishmael <32338445+ishmaelthehunter@users.noreply.github.com>
Date: Tue, 26 Dec 2017 12:05:56 -0600
Subject: [PATCH 3/3] docker-compose

---
 docker-compose.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 docker-compose.yml

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