From 05acfe3e68e13dcbca2f8eeaed76370ae3e7dac4 Mon Sep 17 00:00:00 2001
From: llitfkitfk <llitfkitfk@gmail.com>
Date: Wed, 25 Jul 2018 11:29:53 +0800
Subject: [PATCH] add docker compose & bugfix

---
 .gitignore                                    |  1 +
 .../spring-boot-2-taxi-config/.gitignore      | 25 +++++++++++++++++++
 .../spring-boot-2-taxi-model/.gitignore       | 25 +++++++++++++++++++
 docker-compose.yml                            | 21 ++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-config/.gitignore
 create mode 100644 Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-model/.gitignore
 create mode 100644 docker-compose.yml

diff --git a/.gitignore b/.gitignore
index cd2946a..3d56b91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+.m2
\ No newline at end of file
diff --git a/Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-config/.gitignore b/Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-config/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-config/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-model/.gitignore b/Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-model/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/Chapter06/spring-boot-2-taxi/spring-boot-2-taxi-model/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..dd88d02
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '3'
+
+networks:
+  backend:
+
+services:
+  app:
+    image: maven:alpine
+    ports: 
+      - 8080:8080
+    working_dir: /app
+    command: bash -c "mvn package && java -jar target/spring-boot-2-blog-0.0.1-SNAPSHOT.jar"
+    volumes: 
+      - .m2:/root/.m2
+      - ./Chapter03/spring-boot-2-blog:/app
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.0
+    environment:
+      - cluster.name=docker-cluster
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
\ No newline at end of file