From 11961c2999c00bd74a52c97cf9d88b762230d28e Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 9 Jun 2022 21:24:34 +0800 Subject: [PATCH] updated go.mod --- backend/go.mod | 2 +- backend/go.sum | 8 ++++++-- bin/docker-init.sh | 12 +++++------ bin/docker-start-master.sh | 41 +++++++++++++++++++------------------- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 48f0d69e..9ec7fdcb 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -2,4 +2,4 @@ module crawlab go 1.16 -require github.com/crawlab-team/crawlab-core v0.6.0-7 +require github.com/crawlab-team/crawlab-core v0.6.1-0.20220609124710-a6fcaa2e7ea6 diff --git a/backend/go.sum b/backend/go.sum index 57afa5db..e884d1a2 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -122,8 +122,12 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crawlab-team/crawlab-core v0.0.1/go.mod h1:6dJHMvrmIJbfYHhYNeGZkGOLEBvur+yGiFzLCRXx92k= -github.com/crawlab-team/crawlab-core v0.6.0-7 h1:23kTlKOZ3OqfSmD+SYJiwlqP1Cu1NJtPmbR8KeIGvgw= -github.com/crawlab-team/crawlab-core v0.6.0-7/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0= +github.com/crawlab-team/crawlab-core v0.6.0-8 h1:P1l8dBdecZ6vVxwWwOwjLtCUriSNyBAe01Ghwfndoqw= +github.com/crawlab-team/crawlab-core v0.6.0-8/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0= +github.com/crawlab-team/crawlab-core v0.6.0-9 h1:oBwtAzafOVl2r2vLbLYClgpXDViwVVzqdXnbwC2aGj4= +github.com/crawlab-team/crawlab-core v0.6.0-9/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0= +github.com/crawlab-team/crawlab-core v0.6.1-0.20220609124710-a6fcaa2e7ea6 h1:DGXTxMCJhLZkbBZcwHE6wisUO96nsy5rTlV7e9pQ+Kg= +github.com/crawlab-team/crawlab-core v0.6.1-0.20220609124710-a6fcaa2e7ea6/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0= github.com/crawlab-team/crawlab-db v0.0.2/go.mod h1:o7o4rbcyAWlFGHg9VS7V7tM/GqRq+N2mnAXO71cZA78= github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300 h1:2EymVIiOspX28qNC1Qon3W1fzXKQ8hi6ho3QtXB4w6k= github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU= diff --git a/bin/docker-init.sh b/bin/docker-init.sh index f15755db..170dabbf 100755 --- a/bin/docker-init.sh +++ b/bin/docker-init.sh @@ -1,12 +1,12 @@ #!/bin/bash if [ "${CRAWLAB_NODE_MASTER}" = "Y" ]; then - # start master - /bin/bash /app/bin/docker-start-master.sh + # start master + /bin/bash /app/bin/docker-start-master.sh - # start crawlab - crawlab-server master + # start crawlab + crawlab-server master else - # start crawlab - crawlab-server worker + # start crawlab + crawlab-server worker fi diff --git a/bin/docker-start-master.sh b/bin/docker-start-master.sh index fd271eec..b6bd84ff 100755 --- a/bin/docker-start-master.sh +++ b/bin/docker-start-master.sh @@ -1,23 +1,25 @@ +#!/bin/bash + # replace env indexpath=/app/dist/index.html if test -z "$CRAWLAB_BASE_URL"; then - : + : else - sed -i "s?/js/?${CRAWLAB_BASE_URL}/js/?g" ${indexpath} - sed -i "s?/css/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath} - sed -i "s/ > /var/log/weed.log 2>&1 & - + -dir /data \ + -master.dir ${seaweedfsDataPath} \ + -volume.dir.idx ${seaweedfsDataPath} \ + -ip localhost \ + -volume.port 9999 \ + -filer \ + >>/var/log/weed.log 2>&1 &