From 90285ec72cd571390a1634cb92df1307a946b90d Mon Sep 17 00:00:00 2001
From: terwer <CBGtyw2050*#>
Date: Fri, 15 Mar 2019 01:28:37 +0800
Subject: [PATCH 1/2] Add nginx

---
 docker-compose.yml    | 11 +++++++++++
 jvue-nginx/Dockerfile | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 jvue-nginx/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 3e9b0fb..d8b13f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,17 @@
 # docker-compose up -d --force-recreate
 version: '3'
 services:
+  jvue-nginx:
+    privileged: true
+    image: jvue/nginx:1.15.9
+    container_name: jvue-nginx
+    build:
+      context: ./
+      dockerfile: ./jvue-nginx/Dockerfile
+    ports:
+      - "80:80"
+    volumes:
+      - ./data/nginx/log:/var/log/nginx
   jvue-mysql:
     privileged: true
     image: jvue/mysql:5.7.24
diff --git a/jvue-nginx/Dockerfile b/jvue-nginx/Dockerfile
new file mode 100644
index 0000000..13790c7
--- /dev/null
+++ b/jvue-nginx/Dockerfile
@@ -0,0 +1,11 @@
+#依赖的镜像
+FROM nginx:1.15.9-alpine
+#镜像创建者的信息
+MAINTAINER terwer "csyouwei@gmail.com"
+# 设置编码
+ENV LANG C.UTF-8
+# 设置时区
+# ENV TZ Asia/Shanghai
+ENV TZ CST-8
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file

From d9667924de2f6bbcbc29b14758bc61e5ec7c8c11 Mon Sep 17 00:00:00 2001
From: Terwer <youweics@sina.com>
Date: Fri, 15 Mar 2019 10:04:39 +0800
Subject: [PATCH 2/2] Use nginx proxy jvue-server

---
 docker-compose-dev.yml | 32 +++++++++++++++++++++++++++++++-
 docker-compose.yml     |  2 ++
 jvue-nginx/nginx.conf  | 14 ++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 jvue-nginx/nginx.conf

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index b3276d0..1163b8e 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,10 +1,24 @@
 # 构建docker-compose项目
+# docker-compose up
 # docker-compose up -V --force-recreate
 # docker-compose up -d --force-recreate
 version: '3'
 services:
-  mysql:
+  jvue-nginx:
     privileged: true
+    image: jvue/nginx:1.15.9
+    container_name: jvue-nginx
+    build:
+      context: ./
+      dockerfile: ./jvue-nginx/Dockerfile
+    ports:
+      - "80:80"
+    volumes:
+      - ./jvue-nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ./data/nginx/log:/var/log/nginx
+  jvue-mysql:
+    privileged: true
+    image: jvue/mysql:5.7.24
     container_name: jvue-mysql
     build:
       context: ./
@@ -24,4 +38,20 @@ services:
       - ./data/mysql/log:/var/log
       - ./jvue-mysql/my.cnf:/etc/my.cnf
       - ./jvue-mysql/init:/docker-entrypoint-initdb.d/
+    restart: always
+  jvue-server:
+    privileged: true
+    image: jvue/server:4.0.0
+    container_name: jvue-server
+    build:
+      context: ./
+      dockerfile: ./jvue-server/Dockerfile
+    ports:
+      - "8081:8081"
+    working_dir: /app
+    command: mvn clean spring-boot:run -Dspring-boot.run.profiles=docker -DskipTests
+    volumes:
+      - ./jvue-server:/app
+      - ./data/maven/.m2:/root/.m2
+      - ./data/server/logs:/logs
     restart: always
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d8b13f4..26f490f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,5 @@
 # 构建docker-compose项目
+# docker-compose up
 # docker-compose up -V --force-recreate
 # docker-compose up -d --force-recreate
 version: '3'
@@ -13,6 +14,7 @@ services:
     ports:
       - "80:80"
     volumes:
+      - ./jvue-nginx/nginx.conf:/etc/nginx/conf.d/default.conf
       - ./data/nginx/log:/var/log/nginx
   jvue-mysql:
     privileged: true
diff --git a/jvue-nginx/nginx.conf b/jvue-nginx/nginx.conf
new file mode 100644
index 0000000..c2cbee9
--- /dev/null
+++ b/jvue-nginx/nginx.conf
@@ -0,0 +1,14 @@
+server {
+    listen     80;
+    charset utf-8;
+
+    location /api/ {
+        proxy_set_header   X-Real-IP $remote_addr; # 转发用户IP
+        proxy_pass http://jvue-server:8081; # jvue-server
+    }
+
+    error_page 500 502 503 504 /50x.html;
+    location = /50x.html {
+        root /usr/share/nginx/html;
+    }
+}
\ No newline at end of file