polish

Signed-off-by: Ping Yu <[email protected]>
tikv · Nov 25, 2023 · a5f60d0 · a5f60d0
1 parent b5ffaad
commit a5f60d0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/br/deployments/docker/Dockerfile b/br/deployments/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM golang:1.21-alpine3.18 as builder
-RUN apk add --no-cache git make bash
+RUN apk add --no-cache git make bash build-base
 WORKDIR /go/src/github.com/tikv/migration/br
 COPY . .
 RUN make release

diff --git a/br/tests/rawkv/go.mod b/br/tests/rawkv/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/tikv/migration/br v0.0.0-20221104062935-658ccf72a949
 	github.com/tikv/pd/client v0.0.0-20220307081149-841fa61e9710
 	go.uber.org/zap v1.21.0
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
+	golang.org/x/sync v0.1.0
 	google.golang.org/grpc v1.56.3
 )
 

diff --git a/br/tests/rawkv/go.sum b/br/tests/rawkv/go.sum
@@ -247,6 +247,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

diff --git a/cdc/tests/tests.Dockerfile b/cdc/tests/tests.Dockerfile
@@ -7,9 +7,10 @@ USER root
 WORKDIR /root/download
 
 # Download go into /usr/local dir.
-ENV GOLANG_VERSION 1.21
+# Get the SHA256 from https://golang.org/dl/.
+ENV GOLANG_VERSION 1.21.4
 ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
+ENV GOLANG_DOWNLOAD_SHA256 73cac0215254d0c7d1241fa40837851f3b9a8a742d0b54714cbdfb3feaf8f0af
 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 \