Skip to content

Commit

Permalink
fix(dockerfiles/cd): bump the base image used in dockerfiles
Browse files Browse the repository at this point in the history
Signed-off-by: wuhuizuo <wuhuizuo@126.com>
  • Loading branch information
wuhuizuo committed Jul 3, 2024
1 parent 368e917 commit d5d649e
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dockerfiles/bases/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ build:
cache: {}
tagPolicy:
customTemplate:
template: "v1.8.0-fips"
template: "v1.9.0-fips"
cluster:
concurrency: 0
randomDockerConfigSecret: false
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/bases/tikv-base/fips.Dockerfile
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.8.0
ARG PINGCAP_BASE=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.0
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
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.8.0
FROM ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.0

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

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/pd/Dockerfile
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.8.0
FROM ghcr.io/pingcap-qe/bases/pd-base:v1.9.0

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
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.8.0
FROM ghcr.io/pingcap-qe/bases/pd-base:v1.9.0

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

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb/Dockerfile
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.8.0
FROM ghcr.io/pingcap-qe/bases/tidb-base:v1.9.0

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

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tiflash/Dockerfile
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.8.0
FROM ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.0

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
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.8.0 as final-cdc
FROM ghcr.io/pingcap-qe/bases/tools-base:v1.9.0 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.8.0 as final-dm
FROM ghcr.io/pingcap-qe/bases/tools-base:v1.9.0 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
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.8.0
FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.0

ENV MALLOC_CONF="prof:true,prof_active:false"
COPY --from=building /tikv/bin/tikv-server /tikv-server
Expand Down

0 comments on commit d5d649e

Please sign in to comment.