Commit Graph

5948 Commits

Author SHA1 Message Date
Marvin Zhang
bbf573c836 updated Jenkinsfile 2019-08-16 00:57:17 +08:00
Marvin Zhang
59eecdcdb6 updated Jenkinsfile 2019-08-16 00:57:17 +08:00
Marvin Zhang
00bf346c24 updated Jenkinsfile 2019-08-16 00:43:30 +08:00
Marvin Zhang
f3d4b4e738 updated Jenkinsfile 2019-08-16 00:43:30 +08:00
Marvin Zhang
0f83f73fe8 Merge pull request #132 from tikazyq/develop
Develop
2019-08-16 00:27:37 +08:00
Marvin Zhang
068b689a0f Merge pull request #132 from tikazyq/develop
Develop
2019-08-16 00:27:37 +08:00
Marvin Zhang
5ca969b3db updated README badges 2019-08-16 00:20:19 +08:00
Marvin Zhang
0628409822 updated README badges 2019-08-16 00:20:19 +08:00
Marvin Zhang
629d859f12 updated README badges 2019-08-16 00:18:55 +08:00
Marvin Zhang
84f8df4e46 updated README badges 2019-08-16 00:18:55 +08:00
Marvin Zhang
306303abe0 updated README badges 2019-08-16 00:13:24 +08:00
Marvin Zhang
b27c21cdde updated README badges 2019-08-16 00:13:24 +08:00
Marvin Zhang
7aa6afb4b5 added Dockerfiles 2019-08-16 00:09:04 +08:00
Marvin Zhang
48375f30a9 added Dockerfiles 2019-08-16 00:09:04 +08:00
Marvin Zhang
a1c45cb5de updated Jenkinsfile 2019-08-15 12:11:14 +08:00
Marvin Zhang
bab67911d3 updated Jenkinsfile 2019-08-15 12:11:14 +08:00
Marvin Zhang
3cf5de0f3a Merge pull request #130 from tikazyq/develop
Develop
2019-08-15 11:59:43 +08:00
Marvin Zhang
b5c071e622 Merge pull request #130 from tikazyq/develop
Develop
2019-08-15 11:59:43 +08:00
Marvin Zhang
aaca1763b7 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-15 11:56:37 +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
a912b78ba9 fixed documentation address issue 2019-08-15 11:56:17 +08:00
Marvin Zhang
8c5a23aa38 fixed documentation address issue 2019-08-15 11:56:17 +08:00
Marvin Zhang
b16b1fd20f Merge pull request #129 from yaziming/add_docker_image_build_from_alpine
alpine 镜像
2019-08-15 11:53:46 +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
c3cbc047b1 Fix:
master镜像nginx启动失败

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

Feture:
  增加Dockerfile.worker.alpine 文件
2019-08-15 11:49:17 +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
e6535a1ddf Merge pull request #128 from yaziming/add_docker_image_build_from_alpine
提供alpine基建的Dockerfile
2019-08-15 11:29:48 +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
4a2ebe3b2e 增加 alpine 混合镜像 整体镜像体积减少到404M 2019-08-15 11:06:23 +08:00
jonnnh
e6f8db294c 增加 alpine 混合镜像 整体镜像体积减少到404M 2019-08-15 11:06:23 +08:00
Marvin Zhang
6a5a40cb03 Merge pull request #127 from wo10378931/master
添加Master后端和前端的镜像制作
2019-08-15 09:37:03 +08:00
Marvin Zhang
92cefe14ca Merge pull request #127 from wo10378931/master
添加Master后端和前端的镜像制作
2019-08-15 09:37:03 +08:00
陈景阳
385dc530fd Merge branch 'develop' of https://github.com/tikazyq/crawlab 2019-08-15 09:10:49 +08:00
陈景阳
c9c36cc73f Merge branch 'develop' of https://github.com/tikazyq/crawlab 2019-08-15 09:10:49 +08:00
陈景阳
f2164f906a 修改README.md 2019-08-15 09:09:30 +08:00
陈景阳
e6fe81181d 修改README.md 2019-08-15 09:09:30 +08:00
陈景阳
86b547803f 添加各个节点的镜像制作 2019-08-15 08:08:16 +08:00
陈景阳
9b7448e857 添加各个节点的镜像制作 2019-08-15 08:08:16 +08:00
Marvin Zhang
a18a0d9746 Merge pull request #120 from wo10378931/master
添加使用mac地址和ip地址注册的配置项
2019-08-14 16:23:26 +08:00
Marvin Zhang
4d875c09d8 Merge pull request #120 from wo10378931/master
添加使用mac地址和ip地址注册的配置项
2019-08-14 16:23:26 +08:00
Marvin Zhang
28e433a87c Merge pull request #124 from yaziming/patch_issue#114
修改解压缩文件权限默认为0666的问题
2019-08-14 16:22:59 +08:00
Marvin Zhang
bbfae9ff52 Merge pull request #124 from yaziming/patch_issue#114
修改解压缩文件权限默认为0666的问题
2019-08-14 16:22:59 +08:00
jonnnh
6cb8a257d9 修改解压缩文件权限默认为0666的问题 2019-08-14 15:35:08 +08:00
jonnnh
f4c0726142 修改解压缩文件权限默认为0666的问题 2019-08-14 15:35:08 +08:00
陈景阳
7586964406 Merge branch 'master' of https://github.com/tikazyq/crawlab 2019-08-11 20:02:17 +08:00
陈景阳
369cf76f9f Merge branch 'master' of https://github.com/tikazyq/crawlab 2019-08-11 20:02:17 +08:00
陈景阳
aff161ffd3 添加使用mac地址和ip地址注册的配置项 2019-08-11 20:01:25 +08:00
陈景阳
f80473a485 添加使用mac地址和ip地址注册的配置项 2019-08-11 20:01:25 +08:00
Marvin Zhang
525c7b107d Merge pull request #119 from tikazyq/develop
Develop
2019-08-10 16:42:31 +08:00
Marvin Zhang
dfa2dbcde2 Merge pull request #119 from tikazyq/develop
Develop
2019-08-10 16:42:31 +08:00