From 248707524279baec6be245bd2f491af654e28478 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 06:21:31 +0000 Subject: [PATCH 1/3] chore(deps): update ghcr.io/pingcap-qe/bases/tikv-base docker tag to v1.9.2 --- dockerfiles/cd/builders/tikv/Dockerfile | 2 +- dockerfiles/cd/builders/tikv/centos7/Dockerfile | 2 +- dockerfiles/cd/builders/tikv/fips.Dockerfile | 2 +- dockerfiles/products/tikv-fips.Dockerfile | 2 +- dockerfiles/products/tikv.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dockerfiles/cd/builders/tikv/Dockerfile b/dockerfiles/cd/builders/tikv/Dockerfile index 0bc5bf45..6b025bae 100644 --- a/dockerfiles/cd/builders/tikv/Dockerfile +++ b/dockerfiles/cd/builders/tikv/Dockerfile @@ -37,7 +37,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.1 +FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2 ENV MALLOC_CONF="prof:true,prof_active:false" COPY --from=building /tikv/bin/tikv-server /tikv-server diff --git a/dockerfiles/cd/builders/tikv/centos7/Dockerfile b/dockerfiles/cd/builders/tikv/centos7/Dockerfile index 53a58bad..b978df85 100644 --- a/dockerfiles/cd/builders/tikv/centos7/Dockerfile +++ b/dockerfiles/cd/builders/tikv/centos7/Dockerfile @@ -46,7 +46,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.1 +FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2 ENV MALLOC_CONF="prof:true,prof_active:false" COPY --from=building /tikv/bin/tikv-server /tikv-server diff --git a/dockerfiles/cd/builders/tikv/fips.Dockerfile b/dockerfiles/cd/builders/tikv/fips.Dockerfile index a20030d7..a72191df 100644 --- a/dockerfiles/cd/builders/tikv/fips.Dockerfile +++ b/dockerfiles/cd/builders/tikv/fips.Dockerfile @@ -45,7 +45,7 @@ RUN --mount=type=cache,target=/tikv/target \ RUN /ws/bin/tikv-server --version ########### stage: Final image -FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1-fips +FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2-fips ENV MALLOC_CONF="prof:true,prof_active:false" COPY --from=building /ws/bin/tikv-server /tikv-server diff --git a/dockerfiles/products/tikv-fips.Dockerfile b/dockerfiles/products/tikv-fips.Dockerfile index 1b24a32b..6a34e5c7 100644 --- a/dockerfiles/products/tikv-fips.Dockerfile +++ b/dockerfiles/products/tikv-fips.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1-fips +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2-fips FROM $BASE_IMG COPY tikv-server /tikv-server COPY tikv-ctl /tikv-ctl diff --git a/dockerfiles/products/tikv.Dockerfile b/dockerfiles/products/tikv.Dockerfile index 3cfd76d0..d054915c 100644 --- a/dockerfiles/products/tikv.Dockerfile +++ b/dockerfiles/products/tikv.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1 +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2 FROM $BASE_IMG COPY tikv-server /tikv-server COPY tikv-ctl /tikv-ctl From 2b8594f15f949d68031e6dce63ddaffdc51f2d52 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 9 Oct 2024 14:22:56 +0800 Subject: [PATCH 2/3] Update dockerfiles/cd/builders/tikv/fips.Dockerfile --- dockerfiles/cd/builders/tikv/fips.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/cd/builders/tikv/fips.Dockerfile b/dockerfiles/cd/builders/tikv/fips.Dockerfile index a72191df..a20030d7 100644 --- a/dockerfiles/cd/builders/tikv/fips.Dockerfile +++ b/dockerfiles/cd/builders/tikv/fips.Dockerfile @@ -45,7 +45,7 @@ RUN --mount=type=cache,target=/tikv/target \ RUN /ws/bin/tikv-server --version ########### stage: Final image -FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2-fips +FROM ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1-fips ENV MALLOC_CONF="prof:true,prof_active:false" COPY --from=building /ws/bin/tikv-server /tikv-server From 98bcbc6810a46837feaa135b1f715b556677fb4e Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 9 Oct 2024 14:23:03 +0800 Subject: [PATCH 3/3] Update dockerfiles/products/tikv-fips.Dockerfile --- dockerfiles/products/tikv-fips.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/products/tikv-fips.Dockerfile b/dockerfiles/products/tikv-fips.Dockerfile index 6a34e5c7..1b24a32b 100644 --- a/dockerfiles/products/tikv-fips.Dockerfile +++ b/dockerfiles/products/tikv-fips.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.2-fips +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.9.1-fips FROM $BASE_IMG COPY tikv-server /tikv-server COPY tikv-ctl /tikv-ctl