Skip to content

ci: use pre-baked base images with rclone/shush pre-installed #6970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 4 commits into from
Jul 2, 2026
+3 −58
Merged

ci: use pre-baked base images with rclone/shush pre-installed #6970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eb7220
ci: use pre-baked base images with rclone/shush pre-installed
wuhuizuo Jul 1, 2026
c82787b
Merge remote-tracking branch 'upstream/release-1.x' into ci/prebake-b…
wuhuizuo Jul 1, 2026
42a694c
chore: remove redundant dnf install (tools pre-installed in base images)
wuhuizuo Jul 1, 2026
2d17cd5
ci: use pre-baked e2e-base image for e2e test image
wuhuizuo Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions images/tidb-backup-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.11.1@sha256:24ecefceae6b114e11f6ae675232af3fa4942c53011f807983ac5bff7a62e3d9
FROM ghcr.io/pingcap-qe/ci/tidb-operator_backup-manager-base:v2026.6.28-7-g6f649337
ARG TARGETARCH
ARG RCLONE_VERSION=v1.71.2
ARG SHUSH_VERSION=v1.5.5
ARG WGET_RETRY_OPTS="--tries=5 --timeout=60 --waitretry=5 --retry-connrefused"
RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all

RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
&& unzip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
&& mv rclone-${RCLONE_VERSION}-linux-${TARGETARCH}/rclone /usr/local/bin \
&& chmod 755 /usr/local/bin/rclone \
&& rm -rf rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}

RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/realestate-com-au/shush/releases/download/${SHUSH_VERSION}/shush_linux_${TARGETARCH} \
&& mv shush_linux_${TARGETARCH} /usr/local/bin/shush \
&& chmod 755 /usr/local/bin/shush

COPY --from=pingcap/tidb-lightning:v8.5.5 /tidb-lightning /tidb-lightning-ctl /
COPY --from=pingcap/dumpling:v8.5.5 /dumpling /dumpling

Expand Down
17 changes: 1 addition & 16 deletions images/tidb-backup-manager/Dockerfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.11.1@sha256:24ecefceae6b114e11f6ae675232af3fa4942c53011f807983ac5bff7a62e3d9
FROM ghcr.io/pingcap-qe/ci/tidb-operator_e2e-base:v2026.6.28-7-g6f649337
ARG TARGETARCH=amd64
ARG RCLONE_VERSION=v1.71.2
ARG SHUSH_VERSION=v1.5.5
ARG WGET_RETRY_OPTS="--tries=5 --timeout=60 --waitretry=5 --retry-connrefused"
RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all

RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
&& unzip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \
&& mv rclone-${RCLONE_VERSION}-linux-${TARGETARCH}/rclone /usr/local/bin \
&& chmod 755 /usr/local/bin/rclone \
&& rm -rf rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip rclone-${RCLONE_VERSION}-linux-${TARGETARCH}

RUN wget -nv ${WGET_RETRY_OPTS} https://github.com/realestate-com-au/shush/releases/download/${SHUSH_VERSION}/shush_linux_${TARGETARCH} \
&& mv shush_linux_${TARGETARCH} /usr/local/bin/shush \
&& chmod 755 /usr/local/bin/shush

COPY --from=pingcap/tidb-lightning:v8.5.2 /tidb-lightning /tidb-lightning-ctl /
COPY --from=pingcap/dumpling:v8.5.2 /dumpling /

Expand Down
27 changes: 1 addition & 26 deletions tests/images/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,6 @@
FROM debian:bookworm-slim

ENV KUBECTL_VERSION=v1.28.5
ENV HELM_VERSION=v3.11.0
FROM ghcr.io/pingcap-qe/ci/tidb-operator_e2e-base:v2026.6.28-7-g6f649337

ARG TARGETARCH

# python is required by gcloud
RUN apt-get update && \
apt-get install -y ca-certificates curl git openssl default-mysql-client unzip && \
apt-get install -y python3 && \
apt-get autoremove -y && \
apt-get clean -y

RUN curl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl \
-o /usr/local/bin/kubectl && \
chmod +x /usr/local/bin/kubectl && \
curl https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \
-o helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
tar -zxvf helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz && \
mv linux-${TARGETARCH}/helm /usr/local/bin/helm && \
rm -rf linux-${TARGETARCH} && \
rm helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -r aws awscliv2.zip
RUN curl -L "https://github.com/jetstack/cert-manager/releases/download/v1.15.1/cert-manager.yaml" -o "/cert-manager.yaml"
ADD minio /minio

ADD tidb-operator /charts/e2e/tidb-operator
Expand Down
Loading