Merge branch 'feature/docker-enhancement' into develop

johnnymillergh · johnnymillergh · commit a7d7c98f8803 · 2019-12-31T16:11:54.000+08:00
diff --git a/.env b/.env
@@ -2,4 +2,4 @@
 VUE_APP_PACKAGE_JSON=''
 
 # TAG must be corresponding with the version tag in package.json, need to modify it when new version releases
-TAG=1.2.0
+TAG=1.3.0-beta
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ Here is the highlights of **TypeScript Playground**:
 4. Docker support.
 5. Multi-environment support.
 6. NGINX Gzip support.
+6. Support `Dark` / `Light` color scheme. Self-adaptive color scheme change.
 
 ## Usage
 
diff --git a/docker-compose.development_docker.yml b/docker-compose.development_docker.yml
@@ -12,3 +12,5 @@ services:
         ENV_ALIAS: dev_dkr
     ports:
       - 8081:80
+    volumes:
+      - /Users/johnny/docker-file-mapping/vuetify-typescript-playground/log:/var/log/nginx
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -12,3 +12,5 @@ services:
         ENV_ALIAS: prod
     ports:
       - 8081:80
+    volumes:
+      - /Users/johnny/docker-file-mapping/vuetify-typescript-playground/log:/var/log/nginx
diff --git a/docker-compose.stage.yml b/docker-compose.stage.yml
@@ -12,3 +12,5 @@ services:
         ENV_ALIAS: stage
     ports:
       - 8081:80
+    volumes:
+      - /Users/johnny/docker-file-mapping/vuetify-typescript-playground/log:/var/log/nginx
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -12,3 +12,5 @@ services:
         ENV_ALIAS: test
     ports:
       - 8081:80
+    volumes:
+      - /Users/johnny/docker-file-mapping/vuetify-typescript-playground/log:/var/log/nginx
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuetify-typescript-playground",
-  "version": "1.2.0",
+  "version": "1.3.0-beta",
   "license": "Apache-2.0",
   "description": "Vuetify Typescript Playground",
   "author": {
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/index.html b/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
     <title>vuetify-typescript-playground</title>
   </head>
   <body>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vuetify-typescript-playground",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.3.0-beta",`
`4`	`4`	`"license": "Apache-2.0",`
`5`	`5`	`"description": "Vuetify Typescript Playground",`
`6`	`6`	`"author": {`