Merge pull request #363 from crawlab-team/develop

Develop

Dockerfile

@@ -37,7 +37,6 @@ RUN apt-get update \
 RUN pip install scrapy pymongo bs4 requests -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 # copy backend files
-COPY --from=backend-build /go/src/app .
 COPY --from=backend-build /go/bin/crawlab /usr/local/bin
 
 # install nginx

backend/mock/schedule.go

@@ -10,12 +10,15 @@ import (
 	"time"
 )
 
+var NodeIdss = []bson.ObjectId{bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
+	bson.ObjectIdHex("5d429e6c19f7abede924fee1")}
+
 var scheduleList = []model.Schedule{
 	{
 		Id:       bson.ObjectId("5d429e6c19f7abede924fee2"),
 		Name:     "test schedule",
 		SpiderId: "123",
-		NodeId:   bson.ObjectId("5d429e6c19f7abede924fee2"),
+		NodeIds:  NodeIdss,
 		Cron:     "***1*",
 		EntryId:  10,
 		// 前端展示
@@ -29,7 +32,7 @@ var scheduleList = []model.Schedule{
 		Id:       bson.ObjectId("xx429e6c19f7abede924fee2"),
 		Name:     "test schedule2",
 		SpiderId: "234",
-		NodeId:   bson.ObjectId("5d429e6c19f7abede924fee2"),
+		NodeIds:  NodeIdss,
 		Cron:     "***1*",
 		EntryId:  10,
 		// 前端展示
@@ -100,8 +103,10 @@ func PutSchedule(c *gin.Context) {
 	}
 
 	// 如果node_id为空，则置为空ObjectId
-	if item.NodeId == "" {
-		item.NodeId = bson.ObjectIdHex(constants.ObjectIdNull)
+	for _, NodeId := range item.NodeIds {
+		if NodeId == "" {
+			NodeId = bson.ObjectIdHex(constants.ObjectIdNull)
+		}
 	}
 
 	c.JSON(http.StatusOK, Response{

backend/mock/schedule_test.go

@@ -75,7 +75,7 @@ func TestPostSchedule(t *testing.T) {
 		Id:       bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
 		Name:     "test schedule",
 		SpiderId: bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
-		NodeId:   bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
+		NodeIds:  NodeIdss,
 		Cron:     "***1*",
 		EntryId:  10,
 		// 前端展示
@@ -112,7 +112,7 @@ func TestPutSchedule(t *testing.T) {
 		Id:       bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
 		Name:     "test schedule",
 		SpiderId: bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
-		NodeId:   bson.ObjectIdHex("5d429e6c19f7abede924fee2"),
+		NodeIds:  NodeIdss,
 		Cron:     "***1*",
 		EntryId:  10,
 		// 前端展示

jenkins/develop/docker-compose.yaml

@@ -27,10 +27,6 @@ services:
   mongo:
     image: mongo:latest
     restart: always
-    ports:
-      - "27027:27017"
   redis:
     image: redis:latest
     restart: always
-    ports:
-      - "6389:6379"

jenkins/master/docker-compose.yaml

@@ -29,12 +29,8 @@ services:
     restart: always
     volumes:
       - "/opt/crawlab/mongo/data/db:/data/db"
-    ports:
-      - "27017:27017"
   redis:
     image: redis:latest
     restart: always
     volumes:
       - "/opt/crawlab/redis/data:/data"
-    ports:
-      - "6379:6379"