* 增加Docker开发环境

 * 更新Dockerfile构建文件，升级NodeJS依赖版本。
 * 遵循ESLint重新格式化代码，修复部分警告
 * 登录Token失效增加登出提示
 * 网络请求问题增加错误错误提示
 * 升级UI依赖库

.dockerignore

@@ -3,4 +3,11 @@ logs
 *.log
 dist/
 **/node_modules/
+
 **/tmp/
+**/vendor/
+.github/
+.devops
+k8s
+workspace
+.git/

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13 AS backend-build
+FROM golang:latest AS backend-build
 
 WORKDIR /go/src/app
 COPY ./backend .
@@ -8,16 +8,16 @@ ENV GOPROXY https://goproxy.io
 
 RUN go install -v ./...
 
-FROM node:8.16.0-alpine AS frontend-build
+FROM node:latest AS frontend-build
 
 ADD ./frontend /app
 WORKDIR /app
 
 # install frontend
-RUN npm config set unsafe-perm true
-RUN npm install -g yarn && yarn install
+#RUN npm config set unsafe-perm true
+#RUN npm install -g yarn && yarn install
 
-RUN npm run build:prod
+RUN yarn install && yarn run build:prod
 
 # images
 FROM ubuntu:latest
@@ -31,19 +31,21 @@ ENV CRAWLAB_IS_DOCKER Y
 # install packages
 RUN chmod 777 /tmp \
 	&& apt-get update \
-	&& apt-get install -y curl git net-tools iputils-ping ntp ntpdate python3 python3-pip nginx wget \
+	&& apt-get install -y curl git net-tools iputils-ping ntp ntpdate python3 python3-pip nginx wget dumb-init \
 	&& ln -s /usr/bin/pip3 /usr/local/bin/pip \
 	&& ln -s /usr/bin/python3 /usr/local/bin/python
 
-# install dumb-init
-RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
-RUN chmod +x /usr/local/bin/dumb-init
 
 # install backend
 RUN pip install scrapy pymongo bs4 requests crawlab-sdk scrapy-splash
 
 # add files
-ADD . /app
+COPY ./backend/conf /app/backend/conf
+COPY ./backend/data /app/backend/data
+COPY ./backend/scripts /app/backend/scripts
+COPY ./backend/template /app/backend/template
+COPY ./nginx /app/nginx
+COPY ./docker_init.sh /app/docker_init.sh
 
 # copy backend files
 RUN mkdir -p /opt/bin

Dockerfile.local

@@ -1,23 +1,21 @@
-FROM golang:1.13 AS backend-build
+FROM golang:latest AS backend-build
 
 WORKDIR /go/src/app
 COPY ./backend .
 
 ENV GO111MODULE on
-ENV GOPROXY https://goproxy.io
+ENV GOPROXY https://goproxy.cn
 
 RUN go install -v ./...
 
-FROM node:8.16.0-alpine AS frontend-build
+FROM node:latest AS frontend-build
 
 ADD ./frontend /app
 WORKDIR /app
 
 # install frontend
-RUN npm config set unsafe-perm true
-RUN npm install -g cnpm --registry=https://registry.npm.taobao.org && cnpm install
-
-RUN npm run build:prod
+RUN yarn config set registry https://registry.npm.taobao.org && \
+    yarn install && yarn run build:prod
 
 # images
 FROM ubuntu:latest
@@ -28,22 +26,27 @@ ENV DEBIAN_FRONTEND noninteractive
 # set CRAWLAB_IS_DOCKER
 ENV CRAWLAB_IS_DOCKER Y
 
+
+
 # install packages
 RUN chmod 777 /tmp \
+    && sed -i 's/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list \
 	&& apt-get update \
-	&& apt-get install -y curl git net-tools iputils-ping ntp ntpdate python3 python3-pip nginx wget \
+	&& apt-get install -y curl git net-tools iputils-ping ntp ntpdate python3 python3-pip nginx wget dumb-init\
 	&& ln -s /usr/bin/pip3 /usr/local/bin/pip \
 	&& ln -s /usr/bin/python3 /usr/local/bin/python
 
-# install dumb-init
-RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
-RUN chmod +x /usr/local/bin/dumb-init
 
 # install backend
 RUN pip install scrapy pymongo bs4 requests crawlab-sdk scrapy-splash -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 # add files
-ADD . /app
+COPY ./backend/conf /app/backend/conf
+COPY ./backend/data /app/backend/data
+COPY ./backend/scripts /app/backend/scripts
+COPY ./backend/template /app/backend/template
+COPY ./nginx /app/nginx
+COPY ./docker_init.sh /app/docker_init.sh
 
 # copy backend files
 RUN mkdir -p /opt/bin

docker-compose.local.yml

@@ -0,0 +1,85 @@
+version: '3.3'
+services:
+  master:
+    build:
+      context: ./
+      dockerfile: Dockerfile.local
+    container_name: local_master
+    environment:
+      # CRAWLAB_API_ADDRESS: "https://<your_api_ip>:<your_api_port>"  # backend API address 后端 API 地址. 适用于 https 或者源码部署
+      CRAWLAB_SERVER_MASTER: "Y"  # whether to be master node 是否为主节点，主节点为 Y，工作节点为 N
+      CRAWLAB_MONGO_HOST: "mongo"  # MongoDB host address MongoDB 的地址，在 docker compose 网络中，直接引用服务名称
+      # CRAWLAB_MONGO_PORT: "27017"  # MongoDB port MongoDB 的端口
+      # CRAWLAB_MONGO_DB: "crawlab_test"  # MongoDB database MongoDB 的数据库
+      # CRAWLAB_MONGO_USERNAME: "username"  # MongoDB username MongoDB 的用户名
+      # CRAWLAB_MONGO_PASSWORD: "password"  # MongoDB password MongoDB 的密码
+      # CRAWLAB_MONGO_AUTHSOURCE: "admin"  # MongoDB auth source MongoDB 的验证源
+      CRAWLAB_REDIS_ADDRESS: "redis"  # Redis host address Redis 的地址，在 docker compose 网络中，直接引用服务名称
+      # CRAWLAB_REDIS_PORT: "6379"  # Redis port Redis 的端口
+      # CRAWLAB_REDIS_DATABASE: "1"  # Redis database Redis 的数据库
+      # CRAWLAB_REDIS_PASSWORD: "password"  # Redis password Redis 的密码
+      # CRAWLAB_LOG_LEVEL: "info"  # log level 日志级别. 默认为 info
+      # CRAWLAB_LOG_ISDELETEPERIODICALLY: "N"  # whether to periodically delete log files 是否周期性删除日志文件. 默认不删除
+      # CRAWLAB_LOG_DELETEFREQUENCY: "@hourly"  # frequency of deleting log files 删除日志文件的频率. 默认为每小时
+      # CRAWLAB_TASK_WORKERS: 8  # number of task executors 任务执行器个数（并行执行任务数）
+      # CRAWLAB_SERVER_REGISTER_TYPE: "mac"  # node register type 节点注册方式. 默认为 mac 地址，也可设置为 ip（防止 mac 地址冲突）
+      # CRAWLAB_SERVER_REGISTER_IP: "127.0.0.1"  # node register ip 节点注册IP. 节点唯一识别号，只有当 CRAWLAB_SERVER_REGISTER_TYPE 为 "ip" 时才生效
+      # CRAWLAB_SERVER_LANG_NODE: "Y"  # whether to pre-install Node.js 预安装 Node.js 语言环境
+      # CRAWLAB_SERVER_LANG_JAVA: "Y"  # whether to pre-install Java 预安装 Java 语言环境
+      # CRAWLAB_SERVER_LANG_DOTNET: "Y"  # whether to pre-install .Net core 预安装 .Net Core 语言环境
+      # CRAWLAB_SERVER_LANG_PHP: "Y"  # whether to pre-install PHP 预安装 PHP 语言环境
+      # CRAWLAB_SETTING_ALLOWREGISTER: "N"  # whether to allow user registration 是否允许用户注册
+      # CRAWLAB_SETTING_ENABLETUTORIAL: "N"  # whether to enable tutorial 是否启用教程
+      # CRAWLAB_SETTING_RUNONMASTER: "N"  # whether to run on master node 是否在主节点上运行任务
+      # CRAWLAB_SETTING_DEMOSPIDERS: "Y"  # whether to init demo spiders 是否使用Demo爬虫
+      # CRAWLAB_SETTING_CHECKSCRAPY: "Y"  # whether to automatically check if the spider is scrapy 是否自动检测爬虫为scrapy
+      # CRAWLAB_NOTIFICATION_MAIL_SERVER: smtp.exmaple.com  # STMP server address STMP 服务器地址
+      # CRAWLAB_NOTIFICATION_MAIL_PORT: 465  # STMP server port STMP 服务器端口
+      # CRAWLAB_NOTIFICATION_MAIL_SENDEREMAIL: admin@exmaple.com  # sender email 发送者邮箱
+      # CRAWLAB_NOTIFICATION_MAIL_SENDERIDENTITY: admin@exmaple.com  # sender ID 发送者 ID
+      # CRAWLAB_NOTIFICATION_MAIL_SMTP_USER: username  # SMTP username SMTP 用户名
+      # CRAWLAB_NOTIFICATION_MAIL_SMTP_PASSWORD: password  # SMTP password SMTP 密码
+    ports:
+      - "8080:8080" # frontend port mapping 前端端口映射
+    depends_on:
+      - mongo
+      - redis
+    # volumes:
+    #   - "/var/crawlab/log:/var/logs/crawlab" # log persistent 日志持久化
+  worker:
+    build:
+      context: ./
+      dockerfile: Dockerfile.local
+    container_name: local_master
+    environment:
+      CRAWLAB_SERVER_MASTER: "N"
+      CRAWLAB_MONGO_HOST: "mongo"
+      CRAWLAB_REDIS_ADDRESS: "redis"
+    depends_on:
+      - mongo
+      - redis
+    # environment:
+    #   MONGO_INITDB_ROOT_USERNAME: username
+    #   MONGO_INITDB_ROOT_PASSWORD: password
+    # volumes:
+    #   - "/var/crawlab/log:/var/logs/crawlab" # log persistent 日志持久化
+  mongo:
+    image: mongo:latest
+    restart: always
+    # volumes:
+    #   - "/opt/crawlab/mongo/data/db:/data/db"  # make data persistent 持久化
+    # ports:
+    #   - "27017:27017"  # expose port to host machine 暴露接口到宿主机
+  redis:
+    image: redis:latest
+    restart: always
+    # command: redis-server --requirepass "password" # set redis password 设置 Redis 密码
+    # volumes:
+    #   - "/opt/crawlab/redis/data:/data"  # make data persistent 持久化
+    # ports:
+    #   - "6379:6379"  # expose port to host machine 暴露接口到宿主机
+  # splash:  # use Splash to run spiders on dynamic pages
+  #   image: scrapinghub/splash
+  #   container_name: splash
+  #   ports:
+  #     - "8050:8050"

docker-compose.yml

@@ -1,6 +1,6 @@
 version: '3.3'
 services:
-  master: 
+  master:
     image: tikazyq/crawlab:latest
     container_name: master
     environment:
@@ -37,7 +37,7 @@ services:
       # CRAWLAB_NOTIFICATION_MAIL_SENDERIDENTITY: admin@exmaple.com  # sender ID 发送者 ID
       # CRAWLAB_NOTIFICATION_MAIL_SMTP_USER: username  # SMTP username SMTP 用户名
       # CRAWLAB_NOTIFICATION_MAIL_SMTP_PASSWORD: password  # SMTP password SMTP 密码
-    ports:    
+    ports:
       - "8080:8080" # frontend port mapping 前端端口映射
     depends_on:
       - mongo

frontend/.editorconfig

@@ -1,5 +1,13 @@
-[*.{js,jsx,ts,tsx,vue}]
+root = true
+
+[*]
+charset = utf-8
 indent_style = space
 indent_size = 2
-trim_trailing_whitespace = true
+end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false