chore: upgrade the base image of dev/build-env (#4388)

Co-authored-by: Cwen Yin <cwenyin0@gmail.com>
chaos-mesh · Apr 3, 2024 · 38e49da · 38e49da
1 parent e23120f
commit 38e49da
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml
@@ -86,7 +86,7 @@ jobs:
           # whose target is the branch)
           key: e2e-image-build-cache-${{ runner.os }}
 
-      - name: build e2e images
+      - name: Build e2e images
         env:
           DOCKER_CACHE: 1
           DOCKER_CACHE_DIR: ${{ github.workspace }}/cache
@@ -181,14 +181,12 @@ jobs:
           mv ./output/e2e-binary/e2e.test ./e2e-test/image/e2e/bin/e2e.test
           chmod +x ./e2e-test/image/e2e/bin/ginkgo
           chmod +x ./e2e-test/image/e2e/bin/e2e.test
+
       - name: Setup minikube
-        uses: manusa/actions-setup-minikube@v2.10.0
+        uses: medyagh/setup-minikube@latest
         with:
-          driver: docker
-          minikube version: v1.32.0
-          kubernetes version: ${{ matrix.kubernetes-version }}
-          start args: --cni calico
-          github token: ${{ secrets.GITHUB_TOKEN }}
+          minikube-version: 1.32.0
+          kubernetes-version: ${{ matrix.kubernetes-version }}
 
       - name: load image into minikube
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,6 +66,7 @@ For more information and how-to, see [RFC: Keep A Changelog](https://github.com/
 ### Security
 
 - Remove `-k` from `curl` command lines in chaos-daemon Dockerfile [#4241](https://github.com/chaos-mesh/chaos-mesh/pull/4241)
+- Upgrade the base image of dev/build-env [#4388](https://github.com/chaos-mesh/chaos-mesh/pull/4388)
 
 ## [2.6.0] - 2023-05-30
 

diff --git a/e2e-test/e2e/chaos/stresschaos/misc.go b/e2e-test/e2e/chaos/stresschaos/misc.go
@@ -106,9 +106,9 @@ func getStressCondition(c http.Client, port uint16) (*StressCondition, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
 	out, err := io.ReadAll(resp.Body)
-	defer resp.Body.Close()
 	if err != nil {
 		return nil, err
 	}

diff --git a/images/build-env/Dockerfile b/images/build-env/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:experimental
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -10,12 +10,12 @@ ARG HTTP_PROXY
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
 
-RUN apt-get update && \
-    apt-get install build-essential curl git pkg-config libfuse-dev fuse -y && \
+RUN apt update && \
+    apt install build-essential curl git pkg-config libfuse-dev fuse -y && \
     rm -rf /var/lib/apt/lists/*
 
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs && \
+    apt install -y nodejs && \
     rm -rf /var/lib/apt/lists/*
 RUN npm install pnpm@8 -g
 

diff --git a/images/chaos-daemon/Dockerfile b/images/chaos-daemon/Dockerfile
@@ -48,7 +48,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man2
 RUN apt-get update && \
     echo "deb http://security.debian.org/debian-security bullseye-security main contrib non-free" >> /etc/apt/sources.list && \
     echo "deb http://deb.debian.org/debian bullseye-proposed-updates main contrib non-free" >> /etc/apt/sources.list && \
-    apt --allow-releaseinfo-change update && apt upgrade  -y && \
+    apt --allow-releaseinfo-change update && apt upgrade -y && \
     apt-get install -y tzdata iptables ebtables net-tools ipset stress-ng iproute2 fuse util-linux procps openjdk-11-jre && \
     rm -rf /var/lib/apt/lists/*
 

diff --git a/images/dev-env/Dockerfile b/images/dev-env/Dockerfile
@@ -19,7 +19,7 @@ RUN go install github.com/swaggo/swag/cmd/swag@v1.8.7
 RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.12.0
 RUN go install github.com/apache/skywalking-eyes/cmd/license-eye@v0.2.0
 
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -29,8 +29,8 @@ ARG HTTP_PROXY
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
 
-RUN apt-get update && \
-    apt-get install unzip git build-essential curl python musl musl-dev python3 -y && \
+RUN apt update && \
+    apt install unzip git build-essential curl musl musl-dev -y && \
     rm -rf /var/lib/apt/lists/*
 
 # The `TARGET_PLATFORM` would be `amd64` or `arm64`