git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-23 17:31:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
616 Commits 6 Branches 35 Tags
b5c071e622b9aefcea7ccbc1bec61817f2bf299d
Commit Graph

616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marvin Zhang
b5c071e622 Merge pull request #130 from tikazyq/develop 
Develop
 2019-08-15 11:59:43 +08:00
Marvin Zhang
bec297a217 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-15 11:56:37 +08:00
Marvin Zhang
8c5a23aa38 fixed documentation address issue 2019-08-15 11:56:17 +08:00
Marvin Zhang
2401e12103 Merge pull request #129 from yaziming/add_docker_image_build_from_alpine 
alpine 镜像
 2019-08-15 11:53:46 +08:00
yaziming
231bcfb254 Fix: 
master镜像nginx启动失败

Break change：
 Dockerfile.alpine -> Dockerfile.master.alpine

Feture:
  增加Dockerfile.worker.alpine 文件
 2019-08-15 11:49:17 +08:00
Marvin Zhang
a4fde53248 Merge pull request #128 from yaziming/add_docker_image_build_from_alpine 
提供alpine基建的Dockerfile
 2019-08-15 11:29:48 +08:00
jonnnh
e6f8db294c 增加 alpine 混合镜像 整体镜像体积减少到404M 2019-08-15 11:06:23 +08:00
Marvin Zhang
92cefe14ca Merge pull request #127 from wo10378931/master 
添加Master后端和前端的镜像制作
 2019-08-15 09:37:03 +08:00
陈景阳
c9c36cc73f Merge branch 'develop' of https://github.com/tikazyq/crawlab 2019-08-15 09:10:49 +08:00
陈景阳
e6fe81181d 修改README.md 2019-08-15 09:09:30 +08:00
陈景阳
9b7448e857 添加各个节点的镜像制作 2019-08-15 08:08:16 +08:00
Marvin Zhang
4d875c09d8 Merge pull request #120 from wo10378931/master 
添加使用mac地址和ip地址注册的配置项
 2019-08-14 16:23:26 +08:00
Marvin Zhang
bbfae9ff52 Merge pull request #124 from yaziming/patch_issue#114 
修改解压缩文件权限默认为0666的问题
 2019-08-14 16:22:59 +08:00
jonnnh
f4c0726142 修改解压缩文件权限默认为0666的问题 2019-08-14 15:35:08 +08:00
陈景阳
369cf76f9f Merge branch 'master' of https://github.com/tikazyq/crawlab 2019-08-11 20:02:17 +08:00
陈景阳
f80473a485 添加使用mac地址和ip地址注册的配置项 2019-08-11 20:01:25 +08:00
Marvin Zhang
dfa2dbcde2 Merge pull request #119 from tikazyq/develop 
Develop
 2019-08-10 16:42:31 +08:00
Marvin Zhang
00f53e0348 added Q&A 2019-08-10 16:35:07 +08:00
Marvin Zhang
4d73489836 fixed https://github.com/tikazyq/crawlab/issues/114 2019-08-10 16:13:09 +08:00
Marvin Zhang
c652e905c4 Merge pull request #118 from tikazyq/develop 
Develop
 2019-08-10 15:36:22 +08:00
Marvin Zhang
103adc8045 updated Jenkinsfile 2019-08-10 12:54:27 +08:00
Marvin Zhang
fdf0e3e1cc updated Jenkinsfile 2019-08-10 12:53:46 +08:00
Marvin Zhang
91ab975651 updated Jenkinsfile 2019-08-10 12:52:17 +08:00
Marvin Zhang
259e56bd38 updated Jenkinsfile 2019-08-08 12:40:58 +08:00
Marvin Zhang
d5f0ed5f50 updated Jenkinsfile 2019-08-07 13:05:26 +08:00
Marvin Zhang
6cb75796d5 updated Jenkinsfile 2019-08-07 12:53:08 +08:00
Marvin Zhang
86759c84ab Merge pull request #116 from tikazyq/develop 
Develop
 2019-08-07 12:29:59 +08:00
Marvin Zhang
122b81c16a updated Jenkinsfile 2019-08-07 12:02:33 +08:00
Marvin Zhang
89ed39eff3 updated Jenkinsfile 2019-08-05 20:45:42 +08:00
Marvin Zhang
e48c8ddb85 split envs 2019-08-05 20:23:20 +08:00
Marvin Zhang
dbff205223 split envs 2019-08-05 20:13:47 +08:00
Marvin Zhang
5c189485a2 updated stats 2019-08-05 20:06:17 +08:00
Marvin Zhang
5bc7085edb enhanced interaction for SpiderList 2019-08-05 20:01:47 +08:00
Marvin Zhang
7ac30ce392 updated Jenkinsfile 2019-08-04 22:53:09 +08:00
Marvin Zhang
61c32d27a3 Merge pull request #109 from tikazyq/develop 
Develop
 2019-08-04 21:25:09 +08:00
Marvin Zhang
79ed5623f4 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-04 21:19:29 +08:00
Marvin Zhang
45da5d8d70 updated README 2019-08-04 21:17:35 +08:00
Marvin Zhang
bdb9195dd1 Merge pull request #108 from wo10378931/master 
ADD 启动错误日志打印
 2019-08-03 18:03:37 +08:00
陈景阳
0e4b24fd4a 添加examples/worker的说明 2019-08-03 15:20:15 +08:00
陈景阳
0231b616fb ADD 启动错误日志打印 2019-08-03 14:27:19 +08:00
Marvin Zhang
bfa7550c25 Merge pull request #107 from tikazyq/develop 
changed image urls
 2019-08-03 12:55:31 +08:00
Marvin Zhang
6539d2ac9a changed image urls 2019-08-03 12:52:50 +08:00
Marvin Zhang
3931d9579b Merge pull request #106 from tikazyq/develop 
Develop
 2019-08-03 11:17:03 +08:00
Marvin Zhang
a987213289 Merge branch 'master' of https://github.com/tikazyq/crawlab into develop 2019-08-03 11:14:01 +08:00
Marvin Zhang
e16f782a4a updated sed command 2019-08-03 11:13:28 +08:00
Marvin Zhang
fa0f083683 Delete crawlab 2019-08-03 10:40:52 +08:00
Marvin Zhang
28afe07b8c Delete crawlab 2019-08-03 10:38:43 +08:00
Marvin Zhang
d87b2b0321 Merge pull request #105 from 0xflotus/master 
fixed small errors
 2019-08-02 18:50:10 +08:00
0xflotus
c5b5280bbc Merge pull request #3 from 0xflotus/patch-1 
fixed code highlighting
 2019-08-02 09:54:57 +02:00
0xflotus
943a3664e5 fixed code highlighting 2019-08-02 09:54:38 +02:00