fix ecapture docker images CVE-2024-24790 (#687)

GHSA-xmh6-39mf-3gh7 Signed-off-by: CFC4N <cfc4n.cs@gmail.com>
gojue · Dec 10, 2024 · b4881a1 · b4881a1
1 parent 4ada2d5
commit b4881a1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21.0'
+          go-version: '1.22.10'
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/go-c-cpp.yml b/.github/workflows/go-c-cpp.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21.0'
+          go-version: '1.22.10'
       - name: Install Compilers
         run: |
           sudo apt-get update
@@ -55,7 +55,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21.0'
+          go-version: '1.22.10'
       - name: Install Compilers
         run: |
           sudo apt-get update
@@ -172,9 +172,9 @@ jobs:
             uname -a
             apt-get update
             apt-get install --yes wget git build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-generic linux-tools-common flex bison file gcc-x86-64-linux-gnu libssl-dev bc linux-source
-            wget https://go.dev/dl/go1.21.0.linux-arm64.tar.gz
+            wget https://go.dev/dl/go1.22.10.linux-arm64.tar.gz
             rm -rf /usr/local/go
-            tar -C /usr/local -xzf go1.21.0.linux-arm64.tar.gz
+            tar -C /usr/local -xzf go1.22.10.linux-arm64.tar.gz
             cd /usr/src
             source_file=$(find . -maxdepth 1 -name "*linux-source*.tar.bz2")
             source_dir=$(echo "$source_file" | sed 's/\.tar\.bz2//g')

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21.0'
+          go-version: '1.22.10'
       - name: Install Compilers
         run: |
           sudo apt-get update

diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update &&\
 # Install golang
 ARG TARGETARCH
 RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" = "amd64" ]; then\
-  wget -O go.tar.gz https://golang.google.cn/dl/go1.22.2.linux-${TARGETARCH}.tar.gz; \
+  wget -O go.tar.gz https://golang.google.cn/dl/go1.22.10.linux-${TARGETARCH}.tar.gz; \
   else \
   echo "unsupport arch" && /bin/false ; \
   fi && \

diff --git a/builder/init_env.sh b/builder/init_env.sh
@@ -60,7 +60,7 @@ if [[ ${UNAME_M} =~ "x86_64" ]];then
     echo "unsupported arch ${UNAME_M}";
 fi
 
-GOBIN_ZIP="go1.21.0.linux-${ARCH}.tar.gz"
+GOBIN_ZIP="go1.22.10.linux-${ARCH}.tar.gz"
 echo "GOBIN_ZIP:${GOBIN_ZIP}"