auto commit

frank-lam · frank-lam · commit f627669bbe6b · 2018-11-30T11:58:29.000+08:00
diff --git a/README.md b/README.md
@@ -103,10 +103,43 @@
 
 ## 四、前端
 
-- HTML(5) / CSS(3) / JS
-- vue / react / angular
-- node
-- npm / yarn
+- HTML(5)
+
+- CSS(3)
+
+  sass、scss、stylus
+
+- CSS 框架
+
+  BootStarp、LayUI
+
+- JavaScript 
+
+  基础语法、进阶、ES6
+
+- JavaScript 框架
+
+  - Vue
+  - React 
+  - Angular
+  - jQuery
+
+- Node
+
+  常用 api、对象池、异常处理、进程通信、高并发
+
+- 静态编译
+  - Flow
+  - TypeScript
+
+- 打包工具
+  - Webpack
+  - glup
+  - rollup
+
+- 工具
+  - npm
+  - yarn
 
 
 
diff --git a/notes/Docker基础.md b/notes/Docker基础.md
@@ -439,6 +439,8 @@ services:
 
 
 
+
+
 ## 实战3：快速搭建 GitLab
 
 GitLab 使用163邮箱发送邮件 - 刘锐群的笔记 - CSDN博客
@@ -460,11 +462,11 @@ services:
     web:
       image: 'twang2218/gitlab-ce-zh:10.5'
       restart: always
-      hostname: '120.92.17.12'
+      hostname: '120.131.11.187'
       environment:
         TZ: 'Asia/Shanghai'
         GITLAB_OMNIBUS_CONFIG: |
-          external_url 'http://120.92.17.12:3000'
+          external_url 'http://120.131.11.187:3000'
           gitlab_rails['gitlab_shell_ssh_port'] = 2222
           unicorn['port'] = 8888
           nginx['listen_port'] = 3000
@@ -480,6 +482,14 @@ services:
 
 
 
+
+
+
+
+
+
+
+
 # 参考资料
 
 - [docker前后分离笔记 - 小翼的前端天地](https://my-fe.pub/post/docker-front-and-backend-separation.html#toc-619)
