From 9710b1d3bfdfb1d32645f148c4ce068209544b2b Mon Sep 17 00:00:00 2001 From: "Pony.Ma" <38464007+ma-pony@users.noreply.github.com> Date: Thu, 18 Aug 2022 09:45:38 +0800 Subject: [PATCH 1/3] build(golang/dockerfile): rm unused tar rm unused tar to reduce image size --- workspace/dockerfiles/golang/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workspace/dockerfiles/golang/Dockerfile b/workspace/dockerfiles/golang/Dockerfile index 59e3cbda0..bfffb3212 100644 --- a/workspace/dockerfiles/golang/Dockerfile +++ b/workspace/dockerfiles/golang/Dockerfile @@ -25,12 +25,14 @@ RUN apt-get install -y python3 python3-pip \ # install golang RUN curl -OL https://storage.googleapis.com/golang/go1.16.7.linux-amd64.tar.gz \ && tar -C /usr/local -xvf go1.16.7.linux-amd64.tar.gz \ - && ln -s /usr/local/go/bin/go /usr/local/bin/go + && ln -s /usr/local/go/bin/go /usr/local/bin/go \ + && rm go1.16.7.linux-amd64.tar.gz # install seaweedfs RUN wget https://github.com/chrislusf/seaweedfs/releases/download/2.76/linux_amd64.tar.gz \ && tar -zxf linux_amd64.tar.gz \ - && cp weed /usr/local/bin + && cp weed /usr/local/bin \ + && linux_amd64.tar.gz # install backend RUN pip install scrapy pymongo bs4 requests -i https://mirrors.aliyun.com/pypi/simple From 412643dc10022d3779ab712f60ae4a5c462844e2 Mon Sep 17 00:00:00 2001 From: "Pony.Ma" <38464007+ma-pony@users.noreply.github.com> Date: Thu, 18 Aug 2022 09:48:44 +0800 Subject: [PATCH 2/3] Update Dockerfile --- workspace/dockerfiles/golang/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/dockerfiles/golang/Dockerfile b/workspace/dockerfiles/golang/Dockerfile index bfffb3212..6db9477d0 100644 --- a/workspace/dockerfiles/golang/Dockerfile +++ b/workspace/dockerfiles/golang/Dockerfile @@ -32,7 +32,7 @@ RUN curl -OL https://storage.googleapis.com/golang/go1.16.7.linux-amd64.tar.gz \ RUN wget https://github.com/chrislusf/seaweedfs/releases/download/2.76/linux_amd64.tar.gz \ && tar -zxf linux_amd64.tar.gz \ && cp weed /usr/local/bin \ - && linux_amd64.tar.gz + && rm linux_amd64.tar.gz # install backend RUN pip install scrapy pymongo bs4 requests -i https://mirrors.aliyun.com/pypi/simple From 804797cd9511430be99246a18cbcb27844ffbf14 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 20 Aug 2022 10:46:57 +0800 Subject: [PATCH 3/3] fix(demo): fixed importing demo data indefinitely issue https://github.com/crawlab-team/crawlab/issues/1138 --- backend/go.mod | 2 +- backend/go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/go.mod b/backend/go.mod index a845517db..729b3af9e 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.1-0.20220807014734-91a703d8f762 +require github.com/crawlab-team/crawlab-core v0.6.1-0.20220820024533-b8336f87f24d diff --git a/backend/go.sum b/backend/go.sum index 65ba045c3..1eaec90c5 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -130,12 +130,15 @@ github.com/crawlab-team/crawlab-core v0.6.1-0.20220718062618-6925d9af1673 h1:N9T github.com/crawlab-team/crawlab-core v0.6.1-0.20220718062618-6925d9af1673/go.mod h1:7kvjKE9gnduqvoRHZV7GXSlR1nM7iO/GJy50ERfW8k4= github.com/crawlab-team/crawlab-core v0.6.1-0.20220807014734-91a703d8f762 h1:YS1BmYDhLXrW3efTAvcNr1+a2LJmOBB9QAjQz/6AbOo= github.com/crawlab-team/crawlab-core v0.6.1-0.20220807014734-91a703d8f762/go.mod h1:Bah0/ekMg47cYwtleRBS6UUfIOZYN6+GXZLkyPqMN0E= +github.com/crawlab-team/crawlab-core v0.6.1-0.20220820024533-b8336f87f24d h1:C2mwAnXCY93Osc+s8rtPsOSOjVRGmspUQmorUamYrAE= +github.com/crawlab-team/crawlab-core v0.6.1-0.20220820024533-b8336f87f24d/go.mod h1:KtjBPYGOaVEzLL3Jtf0nNCrmhgndFhXi4Xj6eyU8ptA= github.com/crawlab-team/crawlab-db v0.0.2/go.mod h1:o7o4rbcyAWlFGHg9VS7V7tM/GqRq+N2mnAXO71cZA78= github.com/crawlab-team/crawlab-db v0.6.0-1 h1:Is3a3q1epc7mFP4iDIr9nXlcHSW5IL6jXKQ3YEsXpVo= github.com/crawlab-team/crawlab-db v0.6.0-1/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU= github.com/crawlab-team/crawlab-fs v0.0.0/go.mod h1:k2VXprQspLAmbgO5sSpqMjg/xP4iKDkW4RyTWY8eTZM= github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940 h1:KFZ39oe/QyhhRhXYZSmzDZl3L/JUEPkiiaf4+/iuboY= github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940/go.mod h1:dA1G6xeiClbTMkjRuoagGrcKfQ97jJZRAhZUSwrKdoI= +github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940.0.20220818064917-625d96eea842/go.mod h1:dA1G6xeiClbTMkjRuoagGrcKfQ97jJZRAhZUSwrKdoI= github.com/crawlab-team/crawlab-grpc v0.6.0-beta.20211219.1930 h1:THQ+k+LgCO0Tyw0wDTnTekqnyGhJdsbg3IAhtyqdBlU= github.com/crawlab-team/crawlab-grpc v0.6.0-beta.20211219.1930/go.mod h1:YHWntJs8VVIgYqtrq/mMfYpO8DNhnEzizP0apw9NQ8Y= github.com/crawlab-team/crawlab-log v0.1.0 h1:0t+lZEojs3Vqb/bMkk2qs3I+1+XdwKG3pMTfeK5PZWM=