fix(deps): update docker image of pingcap base to v1.9.1 (#5705) (#5707)

Signed-off-by: ti-chi-bot <[email protected]> Co-authored-by: wuhuizuo <[email protected]> Co-authored-by: Xuecheng Zhang <[email protected]>
pingcap · Aug 14, 2024 · a678a48 · a678a48
1 parent 5de9df3
commit a678a48
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git a/images/br-federation-manager/Dockerfile b/images/br-federation-manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM pingcap/pingcap-base:v1
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 ARG TARGETARCH
 RUN dnf install -y bind-utils tzdata && dnf clean all
 ADD bin/${TARGETARCH}/br-federation-manager /usr/local/bin/br-federation-manager
diff --git a/images/br-federation-manager/Dockerfile.e2e b/images/br-federation-manager/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM pingcap/pingcap-base:v1
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 
 ARG TARGETARCH
 RUN dnf install -y tzdata bind-utils && dnf clean all

diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM pingcap/pingcap-base:v1
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 ARG TARGETARCH
 ARG RCLONE_VERSION=v1.57.0
 ARG SHUSH_VERSION=v1.4.0

diff --git a/images/tidb-backup-manager/Dockerfile.e2e b/images/tidb-backup-manager/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM pingcap/pingcap-base:v1
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 ARG TARGETARCH=amd64
 ARG RCLONE_VERSION=v1.57.0
 ARG SHUSH_VERSION=v1.4.0

diff --git a/images/tidb-operator/Dockerfile b/images/tidb-operator/Dockerfile
@@ -1,4 +1,4 @@
-FROM pingcap/pingcap-base:v1
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 
 ARG TARGETARCH
 RUN dnf install -y tzdata bind-utils && dnf clean all

diff --git a/images/tidb-operator/Dockerfile.e2e b/images/tidb-operator/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM pingcap/pingcap-base:v1
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 
 RUN dnf install -y tzdata bash bind-utils && dnf clean all
 

diff --git a/misc/images/tidb-debug/Dockerfile b/misc/images/tidb-debug/Dockerfile
@@ -1,12 +1,10 @@
-FROM centos:7
+FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 
-RUN yum update -y && yum install -y \
-    curl \
+RUN dnf install -y \
     file \
     gdb \
     git \
     iotop \
-    linux-perf \
     mysql \
     net-tools \
     perf \
@@ -21,9 +19,7 @@ RUN yum update -y && yum install -y \
     vim \
     wget \
     which \
-    netstat \
-    && yum clean all \
-    && rm -rf /var/cache/yum/*
+    && dnf clean all
 
 RUN wget -q http://download.pingcap.org/tidb-latest-linux-amd64.tar.gz \
     && tar xzf tidb-latest-linux-amd64.tar.gz \
@@ -38,9 +34,9 @@ COPY run_flamegraph.sh /run_flamegraph.sh
 COPY gdbinit /root/.gdbinit
 
 # used for go pprof
-ENV GOLANG_VERSION 1.16.15
+ENV GOLANG_VERSION 1.21.13
 ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 77c782a633186d78c384f972fb113a43c24be0234c42fef22c2d8c4c4c8e7475
+ENV GOLANG_DOWNLOAD_SHA256 502fc16d5910562461e6a6631fb6377de2322aad7304bf2bcd23500ba9dab4a7
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
     && echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
     && tar -C /usr/local -xzf golang.tar.gz \
@@ -50,7 +46,7 @@ ENV GOROOT /usr/local/go
 ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
 
 # build delve
-RUN go get github.com/go-delve/delve/cmd/dlv@v1.9.1
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.23.0
 
 ADD banner /etc/banner
 ADD profile  /etc/profile