Merge branch 'cloud' into 'master'

Cloud

See merge request !1

.env

+MONGO_PORT=27017
+REDIS_PORT=6379
+RABBITMQ_PORT=5672
+RABBITMQMG_PORT=15672
\ No newline at end of file

.gitignore

+/config-server/config-server.jar
+/eureka-server/eureka-1.0.0.jar

README.md

-#Introduction
-It's a repo for quickly setting up the development environment. It uses [Docker 17+](https://www.docker.com) to run containers in swarm mode.
+# 介绍
+这是帮助你快速启动Spring Cloud开发环境的docker配置仓库.
 
-Below services will be ran by this tool,
+这个环境包括如下服务：
 
-- Mongo DB 3.2.9
+- Mongo DB 3.4.10
 - Redis 3.2
 - RabbitMQ 3.6 with `stomp` and `shovel` plugins
+- Spring Cloud 
+  - config-server
+  - eureka-server
 
-###Prerequisites
-1. Install `Docker` 17.06+
-2. Enable Swarm mode of Docker
-
-###How to set up my development
-1. Build custom rabbitmq image,
+## 使用前提 
+1. 安装[Docker 17+](https://www.docker.com)
+2. 安装[Docker Compose](https://docs.docker.com/compose/install/#prerequisites)
+3. 构建rabbitmq image
 ```shell
 cd rabbitmq
 ./build.sh
 ```
-1. Run below command in shell,
-```shell
-docker stack deploy -c docker-stack.yml mydev
-```
+4. 在`docker-compose.yml`里配置config-server的配置文件仓库
+   
+## 使用方式
+### 启动 `docker-compose up -d`
+	eureka-server需要等待config-server成功启动才能起来，而目前两个服务时同时起的，
+	所以**间隔几秒后需要执行第二次命令**。
+
+### 销毁环境 `docker-compose down`
+
+### 查看服务运行情况参考`docker-compose help`
 	
-###Note
-By default, the script does not mount the storage of services as external storage. It means the data in MongoDB/Redis/RabbitMQ will be lost after recreating the services/underly containers.
+## 运行数据
+默认情况下,环境销毁后数据会丢失，使用下面的方法可以把数据保存在本地
 
-If you want to persistly save your data, you can create named volume like below,
 ```shell
 docker volume create --opt type=none --opt device=<absolute path of host> --opt o=bind --name mongo_data
 ```

config-server/Dockerfile

+FROM fabric8/java-jboss-openjdk8-jdk:1.4
+
+ENV JAVA_APP_JAR="app.jar"
+ENV JAVA_MAX_MEM_RATIO=50
+ENV AB_OFF ""
+
+ADD --chown=jboss:jboss https://pilipa-assets.oss-cn-beijing.aliyuncs.com/soft/config-server.jar /deployments/app.jar
+
+ENV ENCRYPT_KEY_STORE_PASSWORD=letmein
+ENV ENCRYPT_KEY_STORE_ALIAS=mytestkey
+ENV ENCRYPT_KEY_STORE_SECRET=changeme

docker-stack.yml → docker-compose.yml

 version: "3.3"
 services:
+  eureka-server:
+    build: ./eureka-server
+    depends_on:
+      - config-server
+    ports:
+      - "8761:8761"
+      - "8762:8762"
+    environment:
+      - JAVA_OPTIONS=-server -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/pilipa/ -Duser.timezone=Asia/Hong_Kong
+      - CONFIG_SERVER_URL=http://config-server:8888
+    networks:
+      - pilipa-dev
+  config-server:
+    build: ./config-server
+    ports:
+      - "8888:8888"
+      - "8889:8889"
+    volumes:
+      # 替换成本地config-repo仓库地址
+      - /Users/lz/proj/config-repo:/Users/kane/git/pilipa/config-repo
+    environment:
+      - JAVA_OPTIONS=-server -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/pilipa/ -Duser.timezone=Asia/Hong_Kong
+      - spring.rabbitmq.addresses=rabbit:5672
+    networks:
+      - pilipa-dev
   mongo:
-    image: mongo:3.4
+    image: mongo:3.4.10
     ports:
       - "27017:27017"
     networks:
@@ -30,7 +55,7 @@ services:
 
 networks:
   pilipa-dev:
-    driver: overlay
+    driver: bridge
 
 volumes:
   redis_data:

eureka-server/Dockerfile

+FROM fabric8/java-jboss-openjdk8-jdk:1.4
+
+ENV JAVA_APP_JAR="app.jar"
+ENV JAVA_MAX_MEM_RATIO=50
+ENV AB_OFF ""
+
+ADD --chown=jboss:jboss https://pilipa-assets.oss-cn-beijing.aliyuncs.com/soft/eureka-1.0.0.jar /deployments/app.jar