From 2b3473dc481bf2b67b5a1e7844b606b0fdcd764d Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 22 Nov 2024 17:55:20 +0800 Subject: [PATCH] chore: updated deps --- backend/go.mod | 6 +++++- db/go.mod | 2 +- docker/base-image/Dockerfile | 2 +- .../chromedriver.sh => browser/browser.sh} | 15 ++++++--------- grpc/go.mod | 2 +- grpc/go.sum | 1 + trace/go.mod | 2 +- vcs/go.mod | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) rename docker/base-image/install/{chromedriver/chromedriver.sh => browser/browser.sh} (86%) diff --git a/backend/go.mod b/backend/go.mod index 7175d953..8b9d86b6 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,6 +1,10 @@ module crawlab -go 1.22 +go 1.22.9 + +replace ( + github.com/crawlab-team/crawlab/core => ../core +) require github.com/crawlab-team/crawlab/core v0.0.0-20241119103250-dc9f62dfd09a diff --git a/db/go.mod b/db/go.mod index 8281eb9d..6433aeec 100644 --- a/db/go.mod +++ b/db/go.mod @@ -1,6 +1,6 @@ module github.com/crawlab-team/crawlab/db -go 1.22 +go 1.22.9 replace github.com/crawlab-team/crawlab/trace => ../trace diff --git a/docker/base-image/Dockerfile b/docker/base-image/Dockerfile index a9c6a359..4aa4b72f 100644 --- a/docker/base-image/Dockerfile +++ b/docker/base-image/Dockerfile @@ -6,7 +6,7 @@ RUN bash /app/install/deps/deps.sh && \ bash /app/install/python/python.sh && \ bash /app/install/go/go.sh && \ bash /app/install/node/node.sh && \ - bash /app/install/chromedriver/chromedriver.sh + bash /app/install/browser/browser.sh # Final stage FROM ubuntu:22.04 diff --git a/docker/base-image/install/chromedriver/chromedriver.sh b/docker/base-image/install/browser/browser.sh similarity index 86% rename from docker/base-image/install/chromedriver/chromedriver.sh rename to docker/base-image/install/browser/browser.sh index 79939eed..48a15c78 100644 --- a/docker/base-image/install/chromedriver/chromedriver.sh +++ b/docker/base-image/install/browser/browser.sh @@ -21,17 +21,14 @@ apt-get install -y \ npm install -g @puppeteer/browsers # Install chrome with auto-yes -npx -y @puppeteer/browsers install chrome@${version} +npx -y @puppeteer/browsers install chrome@${version} \ + --install-deps \ + --path=/chrome # Add Chrome to PATH -CHROME_PATH="/chrome/linux-*/chrome-linux64" -if [ -d "$CHROME_PATH" ]; then - CHROME_BIN=$(find "$CHROME_PATH" -name "chrome") - if [ -n "$CHROME_BIN" ]; then - ln -sf "$CHROME_BIN" /usr/local/bin/google-chrome - chmod +x /usr/local/bin/google-chrome - fi -fi +CHROME_PATH="/chrome/linux-${version}/chrome-linux64" +CHROME_BIN="$CHROME_PATH/chrome" +ln -s "$CHROME_BIN" /usr/local/bin/google-chrome # Verify chrome is installed (with more detailed error message) if ! command -v google-chrome &> /dev/null; then diff --git a/grpc/go.mod b/grpc/go.mod index 5afa3138..e7d49d3b 100644 --- a/grpc/go.mod +++ b/grpc/go.mod @@ -1,6 +1,6 @@ module github.com/crawlab-team/crawlab/grpc -go 1.22 +go 1.22.9 require ( google.golang.org/grpc v1.68.0 diff --git a/grpc/go.sum b/grpc/go.sum index 82c68f37..687f5531 100644 --- a/grpc/go.sum +++ b/grpc/go.sum @@ -1,4 +1,5 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= diff --git a/trace/go.mod b/trace/go.mod index 368c0f2b..9d3aeb50 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -1,5 +1,5 @@ module github.com/crawlab-team/crawlab/trace -go 1.22 +go 1.22.9 require github.com/ztrue/tracerr v0.4.0 diff --git a/vcs/go.mod b/vcs/go.mod index e92642cb..f3a47274 100644 --- a/vcs/go.mod +++ b/vcs/go.mod @@ -1,6 +1,6 @@ module github.com/crawlab-team/crawlab/vcs -go 1.22 +go 1.22.9 require ( github.com/apex/log v1.9.0