Skip to content

Commit 74ac23b

Browse files
authored
ci: use pre-baked base images with rclone/shush pre-installed (#6970)
1 parent de49923 commit 74ac23b

3 files changed

Lines changed: 3 additions & 58 deletions

File tree

images/tidb-backup-manager/Dockerfile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
1-
FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.11.1@sha256:24ecefceae6b114e11f6ae675232af3fa4942c53011f807983ac5bff7a62e3d9
1+
FROM ghcr.io/pingcap-qe/ci/tidb-operator_backup-manager-base:v2026.6.28-7-g6f649337
22
ARG TARGETARCH
3-
ARG RCLONE_VERSION=v1.71.2
4-
ARG SHUSH_VERSION=v1.5.5
5-
ARG WGET_RETRY_OPTS="--tries=5 --timeout=60 --waitretry=5 --retry-connrefused"
6-
RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all
7-
8-
RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
9-
&& unzip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
10-
&& mv rclone-${RCLONE_VERSION}-linux-${TARGETARCH}/rclone /usr/local/bin \
11-
&& chmod 755 /usr/local/bin/rclone \
12-
&& rm -rf rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}
13-
14-
RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/realestate-com-au/shush/releases/download/${SHUSH_VERSION}/shush_linux_${TARGETARCH} \
15-
&& mv shush_linux_${TARGETARCH} /usr/local/bin/shush \
16-
&& chmod 755 /usr/local/bin/shush
17-
183
COPY --from=pingcap/tidb-lightning:v8.5.5 /tidb-lightning /tidb-lightning-ctl /
194
COPY --from=pingcap/dumpling:v8.5.5 /dumpling /dumpling
205

images/tidb-backup-manager/Dockerfile.e2e

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
1-
FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.11.1@sha256:24ecefceae6b114e11f6ae675232af3fa4942c53011f807983ac5bff7a62e3d9
1+
FROM ghcr.io/pingcap-qe/ci/tidb-operator_e2e-base:v2026.6.28-7-g6f649337
22
ARG TARGETARCH=amd64
3-
ARG RCLONE_VERSION=v1.71.2
4-
ARG SHUSH_VERSION=v1.5.5
5-
ARG WGET_RETRY_OPTS="--tries=5 --timeout=60 --waitretry=5 --retry-connrefused"
6-
RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all
7-
8-
RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
9-
&& unzip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
10-
&& mv rclone-${RCLONE_VERSION}-linux-${TARGETARCH}/rclone /usr/local/bin \
11-
&& chmod 755 /usr/local/bin/rclone \
12-
&& rm -rf rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}
13-
14-
RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/realestate-com-au/shush/releases/download/${SHUSH_VERSION}/shush_linux_${TARGETARCH} \
15-
&& mv shush_linux_${TARGETARCH} /usr/local/bin/shush \
16-
&& chmod 755 /usr/local/bin/shush
17-
183
COPY --from=pingcap/tidb-lightning:v8.5.2 /tidb-lightning /tidb-lightning-ctl /
194
COPY --from=pingcap/dumpling:v8.5.2 /dumpling /
205

tests/images/e2e/Dockerfile

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,6 @@
1-
FROM debian:bookworm-slim
2-
3-
ENV KUBECTL_VERSION=v1.28.5
4-
ENV HELM_VERSION=v3.11.0
1+
FROM ghcr.io/pingcap-qe/ci/tidb-operator_e2e-base:v2026.6.28-7-g6f649337
52

63
ARG TARGETARCH
7-
8-
# python is required by gcloud
9-
RUN apt-get update && \
10-
apt-get install -y ca-certificates curl git openssl default-mysql-client unzip && \
11-
apt-get install -y python3 && \
12-
apt-get autoremove -y && \
13-
apt-get clean -y
14-
15-
RUN curl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl \
16-
-o /usr/local/bin/kubectl && \
17-
chmod +x /usr/local/bin/kubectl && \
18-
curl https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \
19-
-o helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
20-
tar -zxvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
21-
mv linux-${TARGETARCH}/helm /usr/local/bin/helm && \
22-
rm -rf linux-${TARGETARCH} && \
23-
rm helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
24-
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
25-
unzip awscliv2.zip && \
26-
./aws/install && \
27-
rm -r aws awscliv2.zip
28-
RUN curl -L "https://github.com/jetstack/cert-manager/releases/download/v1.15.1/cert-manager.yaml" -o "/cert-manager.yaml"
294
ADD minio /minio
305

316
ADD tidb-operator /charts/e2e/tidb-operator

0 commit comments

Comments
 (0)