Skip to content
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

Jump to bottom

feat: use pingcap base image #5198

Merged
merged 7 commits into from
Jul 27, 2023
Merged

feat: use pingcap base image #5198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1c8aa3
feat: use pingcap base image
lijie0123 Jul 24, 2023
1670b5c
feat: change utils base image
lijie0123 Jul 25, 2023
8bfd47e
Merge branch 'master' into rocky
lijie0123 Jul 25, 2023
b557c7d
feat: use pingcap dockerhub image
lijie0123 Jul 25, 2023
2ffc153
feat: just use pingcap-base
lijie0123 Jul 25, 2023
233e5a7
feat: br federation change base image
lijie0123 Jul 25, 2023
734c332
fix: base image path
lijie0123 Jul 25, 2023
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
5 changes: 2 additions & 3 deletions images/br-federation-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions images/br-federation-manager/Dockerfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion images/tidb-backup-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/tidb-backup-manager/Dockerfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/tidb-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/tidb-operator/Dockerfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading