From 180d6157c0d5a8ac31a8d07475455fc05e63180d Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Mon, 16 Mar 2020 22:06:25 +0800
Subject: [PATCH] update docker

---
 app/web/src/components/SiderMenu/SiderMenu.js |  2 +-
 config/config.default.js                      |  1 +
 docker/Dockerfile                             | 12 ++++++++++--
 docker/docker-compose.dev.yml                 |  1 +
 docker/entrypoint.sh                          | 17 +++++++++++++++++
 package.json                                  |  2 +-
 6 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 docker/entrypoint.sh

diff --git a/app/web/src/components/SiderMenu/SiderMenu.js b/app/web/src/components/SiderMenu/SiderMenu.js
index d5e11870..52b7fa52 100644
--- a/app/web/src/components/SiderMenu/SiderMenu.js
+++ b/app/web/src/components/SiderMenu/SiderMenu.js
@@ -118,7 +118,7 @@ export default class SiderMenu extends PureComponent {
           mode="inline"
           handleOpenChange={this.handleOpenChange}
           onOpenChange={this.handleOpenChange}
-          style={{ padding: '16px 0', width: '100%', overflowX: 'hidden' }}
+          style={{ padding: '10px 0', width: '100%', overflowX: 'hidden' }}
           {...defaultProps}
         />
       </Sider>
diff --git a/config/config.default.js b/config/config.default.js
index d6d55097..dce399a2 100644
--- a/config/config.default.js
+++ b/config/config.default.js
@@ -23,6 +23,7 @@ module.exports = appInfo => {
       env: {
         APP_ROOT: path.join(__dirname, '../app/web'),
         BROWSER: 'none',
+        HOST: '0.0.0.0',
         SOCKET_SERVER: 'http://127.0.0.1:{port}',
       },
       debug: true,
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b9e661d8..3a2f9eae 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,14 @@
-FROM node:8.11.3-alpine
+FROM alpine:latest
 
 ENV TIME_ZONE=Asia/Shanghai
 
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
+  && apk update \
+  && apk add --no-cache shadow git nodejs nodejs-current-npm bash vim tar curl python python-dev py-pip gcc libcurl make\
+  && usermod -s /bin/bash root \
+  && rm -rf /var/cache/apk/* 
+
+
 RUN \
   mkdir -p /usr/src/app \
   && apk add --no-cache tzdata \
@@ -18,4 +25,5 @@ COPY . /usr/src/app
 
 EXPOSE 10000
 
-CMD npm run dev
\ No newline at end of file
+#CMD npm run dev
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 073eba53..86b7154b 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -14,6 +14,7 @@ services:
       - ../app:/usr/src/app/app
       - ../config:/usr/src/app/config
       - ../package.json:/usr/src/app/package.json
+      - ./entrypoint.sh:/entrypoint.sh
       # - .node_modules:/usr/src/app/node_modules
 
 volumes:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100644
index 00000000..257d596a
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+lockPath="/tmp/init.lock"
+
+npm config set registry http://registry.npm.taobao.org/;
+
+cd /usr/src/app
+
+echo "START INFINI-LOGGING-CENTER"
+
+if [ ! -f "$lockPath" ]; then
+#   npm i --production;
+#   npm run autod
+  npm run dev
+else
+  npm run dev
+fi
diff --git a/package.json b/package.json
index c35951a0..b5590e1e 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
   "scripts": {
     "start": "egg-scripts start --daemon --title=egg-server-ant-design-pro --env prod",
     "stop": "egg-scripts stop --title=egg-server-ant-design-pro",
-    "dev": "npm install --registry=https://registry.npm.taobao.org && egg-bin dev",
+    "dev": "UMI_UI=none egg-bin dev",
     "debug": "egg-bin debug",
     "build": "APP_ROOT=$PWD/app/web umi build",
     "test": "npm run lint -- --fix && npm run test-local",