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

chore(dockerfiles/bases): upgrade docker image pingcap-base to v1.9.1 #361

Merged
merged 6 commits into from
Aug 3, 2024
Merged

chore(dockerfiles/bases): upgrade docker image pingcap-base to v1.9.1 #361

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ff3758
fix(packages): update packages.yaml.tmpl
wuhuizuo Jul 29, 2024
143b141
chore(dockerfiles/bases): upgrade docker image `pingcap-base` to v1.9.1
wuhuizuo Jul 30, 2024
1b7660b
Update packages/packages.yaml.tmpl
wuhuizuo Jul 31, 2024
ff92261
Update packages/packages.yaml.tmpl
wuhuizuo Jul 31, 2024
6896070
Update dockerfiles/cd/builders/tikv/fips.Dockerfile
wuhuizuo Aug 1, 2024
9d4a410
Update dockerfiles/products/tikv-fips.Dockerfile
wuhuizuo Aug 3, 2024
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
2 changes: 1 addition & 1 deletion dockerfiles/bases/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ build:
cache: {}
tagPolicy:
customTemplate:
template: "v1.9.0-fips"
template: "v1.9.1-fips"
cluster:
concurrency: 0
randomDockerConfigSecret: false
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/bases/tikv-base/fips.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PINGCAP_BASE=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.0
ARG PINGCAP_BASE=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
FROM $PINGCAP_BASE
# wget is requested by operator
RUN dnf install -y tzdata wget openssl && dnf clean all
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/ng-monitoring/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN GOPROXY=${GOPROXY} make default -C /ws
RUN /ws/bin/ng-monitoring-server -V

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.1

COPY --from=building /ws/bin/ng-monitoring-server /ng-monitoring-server

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/pd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN /pd/bin/pd-ctl -V
RUN /pd/bin/pd-recover -V

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/pd-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/pd-base:v1.9.1

COPY --from=building /pd/bin/pd-server /pd-server
COPY --from=building /pd/bin/pd-ctl /pd-ctl
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb-dashboard/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN GOPROXY=${GOPROXY} make package -C /ws
RUN /ws/bin/tidb-dashboard -V

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/pd-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/pd-base:v1.9.1

COPY --from=building /ws/bin/tidb-dashboard /tidb-dashboard

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ARG GOPROXY
RUN GOPROXY=${GOPROXY} make build -C /ws && mv /ws/images/tidb-operator/bin/$(arch) /ws/bin

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/tidb-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/tidb-base:v1.9.1

COPY --from=building /ws/bin/tidb-scheduler /usr/local/bin/tidb-scheduler
COPY --from=building /ws/bin/tidb-discovery /usr/local/bin/tidb-discovery
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN GOPROXY=${GOPROXY} make server -C /tidb
RUN /tidb/bin/tidb-server -V

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/tidb-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/tidb-base:v1.9.1

COPY --from=building /tidb/bin/tidb-server /tidb-server

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tiflash/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN mkdir output && mv release-centos7-llvm/tiflash output/tiflash
RUN output/tiflash/tiflash version

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.1

ENV LD_LIBRARY_PATH /tiflash
COPY --from=building /tiflash/output/tiflash /tiflash
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/cd/builders/tiflow/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ RUN /tiflow/bin/dm-syncer -V
RUN /tiflow/bin/dmctl -V

########### stage: Final image - cdc
FROM ghcr.io/pingcap-qe/bases/tools-base:v1.9.0 as final-cdc
FROM ghcr.io/pingcap-qe/bases/tools-base:v1.9.1 as final-cdc

COPY --from=building-cdc /tiflow/bin/cdc /cdc
EXPOSE 8300
CMD ["/cdc"]

########### stage: Final image - dm
FROM ghcr.io/pingcap-qe/bases/tools-base:v1.9.0 as final-dm
FROM ghcr.io/pingcap-qe/bases/tools-base:v1.9.1 as final-dm

COPY --from=building-dm /tiflow/bin/dm-master /dm-master
COPY --from=building-dm /tiflow/bin/dm-worker /dm-worker
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tikv/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN --mount=type=cache,target=/tikv/target \
RUN /tikv/bin/tikv-server --version

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.0
FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1

ENV MALLOC_CONF="prof:true,prof_active:false"
COPY --from=building /tikv/bin/tikv-server /tikv-server
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tikv/fips.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN --mount=type=cache,target=/tikv/target \
RUN /tikv/bin/tikv-server --version

########### stage: Final image
FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.0-fips
FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1-fips
wuhuizuo marked this conversation as resolved.
Show resolved Hide resolved

ENV MALLOC_CONF="prof:true,prof_active:false"
COPY --from=building /tikv/bin/tikv-server /tikv-server
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/br.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
FROM $BASE_IMG
COPY br /br
2 changes: 1 addition & 1 deletion dockerfiles/products/dm.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY dm-worker /dm-worker
COPY dm-master /dm-master
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/dumpling.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY dumpling /dumpling
2 changes: 1 addition & 1 deletion dockerfiles/products/ng-monitoring.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.1
FROM $BASE_IMG
COPY ng-monitoring-server /ng-monitoring-server
EXPOSE 12020
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/pd.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.1
FROM $BASE_IMG
COPY pd-server /pd-server
COPY pd-ctl /pd-ctl
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/ticdc.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY cdc /cdc
EXPOSE 8300
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb-binlog.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY pump /pump
COPY drainer /drainer
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb-dashboard.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.1
FROM $BASE_IMG
COPY tidb-dashboard /tidb-dashboard
EXPOSE 12333
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb-enterprise.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.9.1
FROM $BASE_IMG
COPY tidb-server /tidb-server
COPY audit-1.so /plugins/audit-1.so
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb-lightning-debug.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY tidb-lightning /tidb-lightning
COPY tidb-lightning-ctl /tidb-lightning-ctl
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb-lightning.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY tidb-lightning /tidb-lightning
COPY tidb-lightning-ctl /tidb-lightning-ctl
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb-tools.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.1
FROM $BASE_IMG
COPY sync_diff_inspector /sync_diff_inspector
2 changes: 1 addition & 1 deletion dockerfiles/products/tidb.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.9.1
FROM $BASE_IMG
COPY tidb-server /tidb-server
EXPOSE 4000
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tiflash.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.1
FROM $BASE_IMG
ENV LD_LIBRARY_PATH /tiflash
COPY tiflash /tiflash
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tikv-fips.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.0-fips
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1-fips
FROM $BASE_IMG
wuhuizuo marked this conversation as resolved.
Show resolved Hide resolved
COPY tikv-server /tikv-server
COPY tikv-ctl /tikv-ctl
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tikv.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1
FROM $BASE_IMG
COPY tikv-server /tikv-server
COPY tikv-ctl /tikv-ctl
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/products/tiproxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.0
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
FROM $BASE_IMG

COPY tiproxy tiproxyctl /bin/
Expand Down
Loading