feat: use pingcap base image (#5198)

pingcap · Jul 27, 2023 · f838c88 · f838c88
1 parent 34c19d4
commit f838c88
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/images/br-federation-manager/Dockerfile b/images/br-federation-manager/Dockerfile
@@ -1,5 +1,4 @@
-FROM alpine:3.14
-
+FROM pingcap/pingcap-base:v1
 ARG TARGETARCH
-RUN apk add tzdata bind-tools --no-cache
+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,5 +1,5 @@
-FROM alpine:3.14
+FROM pingcap/pingcap-base:v1
 
 ARG TARGETARCH
-RUN apk add tzdata bind-tools --no-cache
+RUN dnf install -y tzdata bind-utils && dnf clean all
 ADD bin/br-federation-manager /usr/local/bin/br-federation-manager
diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM rockylinux:9.1.20230215
+FROM pingcap/pingcap-base:v1
 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 rockylinux:9.1.20230215
+FROM pingcap/pingcap-base:v1
 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,7 +1,7 @@
-FROM alpine:3.14
+FROM pingcap/pingcap-base:v1
 
 ARG TARGETARCH
-RUN apk add tzdata bind-tools --no-cache
+RUN dnf install -y tzdata bind-utils && dnf clean all
 ADD bin/${TARGETARCH}/tidb-scheduler /usr/local/bin/tidb-scheduler
 ADD bin/${TARGETARCH}/tidb-discovery /usr/local/bin/tidb-discovery
 ADD bin/${TARGETARCH}/tidb-controller-manager /usr/local/bin/tidb-controller-manager

diff --git a/images/tidb-operator/Dockerfile.e2e b/images/tidb-operator/Dockerfile.e2e
@@ -1,6 +1,6 @@
-FROM alpine:3.14
+FROM pingcap/pingcap-base:v1
 
-RUN apk add tzdata bash bind-tools --no-cache
+RUN dnf install -y tzdata bash bind-utils && dnf clean all
 
 ADD bin/tidb-scheduler /usr/local/bin/tidb-scheduler
 ADD bin/tidb-discovery /usr/local/bin/tidb-discovery