Merge pull request #108 from ntutshop/modify/project-configuration

Modify/project configuration
ntutshop · Jan 8, 2019 · e62f567 · e62f567
2 parents d45a3ad + aca0470
commit e62f567
Show file tree

Hide file tree

Showing 123 changed files with 21 additions and 295 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,12 @@
 FROM node
 
-ENV HOST 0.0.0.0
+ADD . /app
 
-# 設定工作目錄為 /app
 WORKDIR /app
 
-# 複製目前目錄下的內容，放進 Docker 容器中的 /app
-ADD . /app
-
-# 架設基本環境
-RUN yarn
+RUN yarn install
 RUN yarn build
 
-CMD [ "yarn", "docker" ]
+CMD [ "yarn", "start" ]
 
 EXPOSE 3000
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,15 +1,16 @@
 version: '3'
 services:
-  nuxt:
-      build: .
-      ports:
-          - "3000:3000"
-      expose:
-          - "3000"
-      volumes:
-          - .:/app
-      depends_on:
-          - mariadb
+  web:
+    build: .
+    ports:
+      - "3000:3000"
+    expose:
+      - "3000"
+    depends_on:
+      - mariadb
+    environment:
+      DOCKER_ENV: "1"
+    restart: always
   mariadb:
     container_name: mariadb
     image: mariadb
@@ -18,12 +19,13 @@ services:
     expose:
       - "3306"
     volumes:
-      - ./mysql:/var/lib/mysql
       - ./server/sql/action.sql:/docker-entrypoint-initdb.d/action.sql
-    command: ['--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
+    command: 
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
     environment:
-      MYSQL_ROOT_PASSWORD: 123456
       MYSQL_USER: shopkeeper
       MYSQL_PASSWORD: ycjls5dm
       MYSQL_DATABASE: ntutdb
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
     restart: always
diff --git a/mysql/aria_log.00000001 b/mysql/aria_log.00000001
diff --git a/mysql/aria_log_control b/mysql/aria_log_control
diff --git a/mysql/ib_buffer_pool b/mysql/ib_buffer_pool
diff --git a/mysql/ib_logfile0 b/mysql/ib_logfile0
diff --git a/mysql/ib_logfile1 b/mysql/ib_logfile1
diff --git a/mysql/ibdata1 b/mysql/ibdata1
diff --git a/mysql/multi-master.info b/mysql/multi-master.info
diff --git a/mysql/mysql/column_stats.MYD b/mysql/mysql/column_stats.MYD
diff --git a/mysql/mysql/column_stats.MYI b/mysql/mysql/column_stats.MYI
diff --git a/mysql/mysql/column_stats.frm b/mysql/mysql/column_stats.frm
diff --git a/mysql/mysql/columns_priv.MYD b/mysql/mysql/columns_priv.MYD
diff --git a/mysql/mysql/columns_priv.MYI b/mysql/mysql/columns_priv.MYI
diff --git a/mysql/mysql/columns_priv.frm b/mysql/mysql/columns_priv.frm
diff --git a/mysql/mysql/db.MYD b/mysql/mysql/db.MYD
diff --git a/mysql/mysql/db.MYI b/mysql/mysql/db.MYI
diff --git a/mysql/mysql/db.frm b/mysql/mysql/db.frm
diff --git a/mysql/mysql/event.MYD b/mysql/mysql/event.MYD
diff --git a/mysql/mysql/event.MYI b/mysql/mysql/event.MYI
diff --git a/mysql/mysql/event.frm b/mysql/mysql/event.frm
diff --git a/mysql/mysql/func.MYD b/mysql/mysql/func.MYD
diff --git a/mysql/mysql/func.MYI b/mysql/mysql/func.MYI
diff --git a/mysql/mysql/func.frm b/mysql/mysql/func.frm
diff --git a/mysql/mysql/general_log.CSM b/mysql/mysql/general_log.CSM
diff --git a/mysql/mysql/general_log.CSV b/mysql/mysql/general_log.CSV
diff --git a/mysql/mysql/general_log.frm b/mysql/mysql/general_log.frm
diff --git a/mysql/mysql/gtid_slave_pos.frm b/mysql/mysql/gtid_slave_pos.frm
diff --git a/mysql/mysql/gtid_slave_pos.ibd b/mysql/mysql/gtid_slave_pos.ibd
diff --git a/mysql/mysql/help_category.MYD b/mysql/mysql/help_category.MYD
diff --git a/mysql/mysql/help_category.MYI b/mysql/mysql/help_category.MYI
diff --git a/mysql/mysql/help_category.frm b/mysql/mysql/help_category.frm
diff --git a/mysql/mysql/help_keyword.MYD b/mysql/mysql/help_keyword.MYD
diff --git a/mysql/mysql/help_keyword.MYI b/mysql/mysql/help_keyword.MYI
diff --git a/mysql/mysql/help_keyword.frm b/mysql/mysql/help_keyword.frm
diff --git a/mysql/mysql/help_relation.MYD b/mysql/mysql/help_relation.MYD
diff --git a/mysql/mysql/help_relation.MYI b/mysql/mysql/help_relation.MYI
diff --git a/mysql/mysql/help_relation.frm b/mysql/mysql/help_relation.frm
diff --git a/mysql/mysql/help_topic.MYD b/mysql/mysql/help_topic.MYD
diff --git a/mysql/mysql/help_topic.MYI b/mysql/mysql/help_topic.MYI
diff --git a/mysql/mysql/help_topic.frm b/mysql/mysql/help_topic.frm
diff --git a/mysql/mysql/host.MYD b/mysql/mysql/host.MYD
diff --git a/mysql/mysql/host.MYI b/mysql/mysql/host.MYI
diff --git a/mysql/mysql/host.frm b/mysql/mysql/host.frm
diff --git a/mysql/mysql/index_stats.MYD b/mysql/mysql/index_stats.MYD
diff --git a/mysql/mysql/index_stats.MYI b/mysql/mysql/index_stats.MYI
diff --git a/mysql/mysql/index_stats.frm b/mysql/mysql/index_stats.frm
diff --git a/mysql/mysql/innodb_index_stats.frm b/mysql/mysql/innodb_index_stats.frm
diff --git a/mysql/mysql/innodb_index_stats.ibd b/mysql/mysql/innodb_index_stats.ibd
diff --git a/mysql/mysql/innodb_table_stats.frm b/mysql/mysql/innodb_table_stats.frm
diff --git a/mysql/mysql/innodb_table_stats.ibd b/mysql/mysql/innodb_table_stats.ibd
diff --git a/mysql/mysql/plugin.MYD b/mysql/mysql/plugin.MYD
diff --git a/mysql/mysql/plugin.MYI b/mysql/mysql/plugin.MYI
diff --git a/mysql/mysql/plugin.frm b/mysql/mysql/plugin.frm
diff --git a/mysql/mysql/proc.MYD b/mysql/mysql/proc.MYD
diff --git a/mysql/mysql/proc.MYI b/mysql/mysql/proc.MYI
diff --git a/mysql/mysql/proc.frm b/mysql/mysql/proc.frm
diff --git a/mysql/mysql/procs_priv.MYD b/mysql/mysql/procs_priv.MYD
diff --git a/mysql/mysql/procs_priv.MYI b/mysql/mysql/procs_priv.MYI
diff --git a/mysql/mysql/procs_priv.frm b/mysql/mysql/procs_priv.frm
diff --git a/mysql/mysql/proxies_priv.MYD b/mysql/mysql/proxies_priv.MYD
diff --git a/mysql/mysql/proxies_priv.MYI b/mysql/mysql/proxies_priv.MYI
diff --git a/mysql/mysql/proxies_priv.frm b/mysql/mysql/proxies_priv.frm
diff --git a/mysql/mysql/roles_mapping.MYD b/mysql/mysql/roles_mapping.MYD
diff --git a/mysql/mysql/roles_mapping.MYI b/mysql/mysql/roles_mapping.MYI
diff --git a/mysql/mysql/roles_mapping.frm b/mysql/mysql/roles_mapping.frm
diff --git a/mysql/mysql/servers.MYD b/mysql/mysql/servers.MYD
diff --git a/mysql/mysql/servers.MYI b/mysql/mysql/servers.MYI
diff --git a/mysql/mysql/servers.frm b/mysql/mysql/servers.frm
diff --git a/mysql/mysql/slow_log.CSM b/mysql/mysql/slow_log.CSM
diff --git a/mysql/mysql/slow_log.CSV b/mysql/mysql/slow_log.CSV
diff --git a/mysql/mysql/slow_log.frm b/mysql/mysql/slow_log.frm
diff --git a/mysql/mysql/table_stats.MYD b/mysql/mysql/table_stats.MYD
diff --git a/mysql/mysql/table_stats.MYI b/mysql/mysql/table_stats.MYI
diff --git a/mysql/mysql/table_stats.frm b/mysql/mysql/table_stats.frm
diff --git a/mysql/mysql/tables_priv.MYD b/mysql/mysql/tables_priv.MYD
diff --git a/mysql/mysql/tables_priv.MYI b/mysql/mysql/tables_priv.MYI
diff --git a/mysql/mysql/tables_priv.frm b/mysql/mysql/tables_priv.frm
diff --git a/mysql/mysql/time_zone.MYD b/mysql/mysql/time_zone.MYD
diff --git a/mysql/mysql/time_zone.MYI b/mysql/mysql/time_zone.MYI
diff --git a/mysql/mysql/time_zone.frm b/mysql/mysql/time_zone.frm
diff --git a/mysql/mysql/time_zone_leap_second.MYD b/mysql/mysql/time_zone_leap_second.MYD
diff --git a/mysql/mysql/time_zone_leap_second.MYI b/mysql/mysql/time_zone_leap_second.MYI
diff --git a/mysql/mysql/time_zone_leap_second.frm b/mysql/mysql/time_zone_leap_second.frm
diff --git a/mysql/mysql/time_zone_name.MYD b/mysql/mysql/time_zone_name.MYD
diff --git a/mysql/mysql/time_zone_name.MYI b/mysql/mysql/time_zone_name.MYI
diff --git a/mysql/mysql/time_zone_name.frm b/mysql/mysql/time_zone_name.frm
diff --git a/mysql/mysql/time_zone_transition.MYD b/mysql/mysql/time_zone_transition.MYD
diff --git a/mysql/mysql/time_zone_transition.MYI b/mysql/mysql/time_zone_transition.MYI
diff --git a/mysql/mysql/time_zone_transition.frm b/mysql/mysql/time_zone_transition.frm
diff --git a/mysql/mysql/time_zone_transition_type.MYD b/mysql/mysql/time_zone_transition_type.MYD
diff --git a/mysql/mysql/time_zone_transition_type.MYI b/mysql/mysql/time_zone_transition_type.MYI
diff --git a/mysql/mysql/time_zone_transition_type.frm b/mysql/mysql/time_zone_transition_type.frm
diff --git a/mysql/mysql/transaction_registry.frm b/mysql/mysql/transaction_registry.frm
diff --git a/mysql/mysql/transaction_registry.ibd b/mysql/mysql/transaction_registry.ibd
diff --git a/mysql/mysql/user.MYD b/mysql/mysql/user.MYD
diff --git a/mysql/mysql/user.MYI b/mysql/mysql/user.MYI
diff --git a/mysql/mysql/user.frm b/mysql/mysql/user.frm
diff --git a/mysql/ntutdb/GOOD.frm b/mysql/ntutdb/GOOD.frm
diff --git a/mysql/ntutdb/GOOD.ibd b/mysql/ntutdb/GOOD.ibd
diff --git a/mysql/ntutdb/IMAGE.frm b/mysql/ntutdb/IMAGE.frm
diff --git a/mysql/ntutdb/IMAGE.ibd b/mysql/ntutdb/IMAGE.ibd
diff --git a/mysql/ntutdb/MEMBER.frm b/mysql/ntutdb/MEMBER.frm
diff --git a/mysql/ntutdb/MEMBER.ibd b/mysql/ntutdb/MEMBER.ibd
diff --git a/mysql/ntutdb/MESSAGE_BOARD.frm b/mysql/ntutdb/MESSAGE_BOARD.frm
diff --git a/mysql/ntutdb/MESSAGE_BOARD.ibd b/mysql/ntutdb/MESSAGE_BOARD.ibd
diff --git a/mysql/ntutdb/ORDER.frm b/mysql/ntutdb/ORDER.frm
diff --git a/mysql/ntutdb/ORDER.ibd b/mysql/ntutdb/ORDER.ibd
diff --git a/mysql/ntutdb/PAYMENT.frm b/mysql/ntutdb/PAYMENT.frm
diff --git a/mysql/ntutdb/PAYMENT.ibd b/mysql/ntutdb/PAYMENT.ibd
diff --git a/mysql/ntutdb/RATE.frm b/mysql/ntutdb/RATE.frm
diff --git a/mysql/ntutdb/RATE.ibd b/mysql/ntutdb/RATE.ibd
diff --git a/mysql/ntutdb/SHIPPING.frm b/mysql/ntutdb/SHIPPING.frm
diff --git a/mysql/ntutdb/SHIPPING.ibd b/mysql/ntutdb/SHIPPING.ibd
diff --git a/mysql/ntutdb/SHOPPING_CART.frm b/mysql/ntutdb/SHOPPING_CART.frm
diff --git a/mysql/ntutdb/SHOPPING_CART.ibd b/mysql/ntutdb/SHOPPING_CART.ibd
diff --git a/mysql/ntutdb/TAG.frm b/mysql/ntutdb/TAG.frm
diff --git a/mysql/ntutdb/TAG.ibd b/mysql/ntutdb/TAG.ibd
diff --git a/mysql/ntutdb/db.opt b/mysql/ntutdb/db.opt
diff --git a/mysql/performance_schema/db.opt b/mysql/performance_schema/db.opt
diff --git a/nginx/default.conf b/nginx/default.conf
diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "back": "cross-env NODE_ENV=development nodemon server/back.js --watch server --exec babel-node",
     "build": "nuxt build",
     "start": "cross-env NODE_ENV=production babel-node server/index.js",
-    "docker": "cross-env NODE_ENV=production DOCKER_ENV=1 babel-node server/index.js",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue .",
     "lintfix": "eslint --fix --ext .js,.vue .",

diff --git a/server/config/config.js b/server/config/config.js
@@ -1,5 +1,5 @@
-const DOMAIN = process.env.DOMAIN || 'virtualprism.io'
-const DB_DOMAIN = (process.env.NODE_ENV === 'production') ? DOMAIN : 'virtualprism.io'
+const DOMAIN = process.env.DOMAIN || 'ntut.shop'
+const DB_DOMAIN = process.env.DB_DOMAIN || ((process.env.DOCKER_ENV) ? 'mariadb' : DOMAIN)
 
 export let SERVER_CONFIG = {
   HOST: (process.env.NODE_ENV === 'production') ? '0.0.0.0' : 'localhost',
@@ -10,7 +10,7 @@ export let SERVER_CONFIG = {
 }
 
 export let DB_CONFIG = {
-  HOST: (process.env.DOCKER_ENV) ? 'mariadb' : DB_DOMAIN,
+  HOST: DB_DOMAIN,
   USER: 'shopkeeper',
   PASSWORD: 'ycjls5dm',
   DATABASE: 'ntutdb',