From af08bd2e0526fe065960026b8e72ee6e9b2c3810 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 21 Oct 2024 04:02:11 +0000 Subject: [PATCH] refactor(dockerfile): update dockerfile for release 6.5 From for ~6.5.12 we switch the base image to the new one. Signed-off-by: wuhuizuo --- .github/scripts/ci.sh | 36 +---- .../products/le6.5-linux-amd64-debug/tiem | 15 -- dockerfiles/products/le6.5-linux-amd64/tiem | 15 -- .../le6.5-linux-arm64/dm-monitor-initializer | 11 -- .../products/le6.5-linux-arm64/tidb-operator | 7 - .../Dockerfile} | 0 .../{le6.5 => lt6.5.12}/Dockerfile | 2 +- .../products/ng-monitoring/~6.5.12/Dockerfile | 5 + .../products/{pd.Dockerfile => pd/Dockerfile} | 0 .../pd/{le6.5 => lt6.5.12}/Dockerfile | 0 dockerfiles/products/pd/~6.5.12/Dockerfile | 7 + .../Dockerfile} | 0 .../{le6.5 => lt6.5.12}/Dockerfile | 0 .../products/tidb-binlog/~6.5.12/Dockerfile | 9 ++ .../Dockerfile} | 0 .../{le6.5 => lt6.5.12}/Dockerfile | 0 .../tidb-dashboard/~6.5.12/Dockerfile | 5 + .../Dockerfile} | 0 .../tidb-tools/{le6.5 => lt6.5.12}/Dockerfile | 0 .../products/tidb-tools/~6.5.12/Dockerfile | 3 + dockerfiles/products/{ => tidb}/br.Dockerfile | 0 .../products/{ => tidb}/dumpling.Dockerfile | 0 .../tidb/{le6.5 => lt6.5.12}/br.Dockerfile | 0 .../{le6.5 => lt6.5.12}/dumpling.Dockerfile | 0 .../tidb-lightning.Dockerfile | 0 .../tidb/{le6.5 => lt6.5.12}/tidb.Dockerfile | 0 .../tidb.enterprise.Dockerfile | 0 .../{ => tidb}/tidb-lightning.Dockerfile | 0 .../products/{ => tidb}/tidb.Dockerfile | 0 .../tidb.enterprise.Dockerfile} | 0 .../products/tidb/~6.5.12/br.Dockerfile | 4 + .../products/tidb/~6.5.12/dumpling.Dockerfile | 4 + .../~6.5.12/tidb-lightning.Dockerfile} | 1 + .../~6.5.12/tidb.Dockerfile} | 2 +- .../~6.5.12/tidb.enterprise.Dockerfile} | 2 +- .../Dockerfile} | 0 .../tiflash/{le6.5 => lt6.5.12}/Dockerfile | 0 .../products/tiflash/~6.5.12/Dockerfile | 5 + .../products/{ => tiflow}/dm.Dockerfile | 0 .../tiflow/{le6.5 => lt6.5.12}/dm.Dockerfile | 0 .../{le6.5 => lt6.5.12}/ticdc.Dockerfile | 0 .../products/{ => tiflow}/ticdc.Dockerfile | 0 .../products/tiflow/~6.5.12/dm.Dockerfile | 8 ++ .../products/tiflow/~6.5.12/ticdc.Dockerfile | 7 + .../{tikv.Dockerfile => tikv/Dockerfile} | 0 .../fips.Dockerfile} | 0 .../tikv/{le6.5 => lt6.5.12}/Dockerfile | 0 dockerfiles/products/tikv/~6.5.12/Dockerfile | 6 + packages/packages.yaml.tmpl | 133 +++++++----------- 49 files changed, 120 insertions(+), 167 deletions(-) delete mode 100644 dockerfiles/products/le6.5-linux-amd64-debug/tiem delete mode 100644 dockerfiles/products/le6.5-linux-amd64/tiem delete mode 100644 dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer delete mode 100644 dockerfiles/products/le6.5-linux-arm64/tidb-operator rename dockerfiles/products/{ng-monitoring.Dockerfile => ng-monitoring/Dockerfile} (100%) rename dockerfiles/products/ng-monitoring/{le6.5 => lt6.5.12}/Dockerfile (62%) create mode 100644 dockerfiles/products/ng-monitoring/~6.5.12/Dockerfile rename dockerfiles/products/{pd.Dockerfile => pd/Dockerfile} (100%) rename dockerfiles/products/pd/{le6.5 => lt6.5.12}/Dockerfile (100%) create mode 100644 dockerfiles/products/pd/~6.5.12/Dockerfile rename dockerfiles/products/{tidb-binlog.Dockerfile => tidb-binlog/Dockerfile} (100%) rename dockerfiles/products/tidb-binlog/{le6.5 => lt6.5.12}/Dockerfile (100%) create mode 100644 dockerfiles/products/tidb-binlog/~6.5.12/Dockerfile rename dockerfiles/products/{tidb-dashboard.Dockerfile => tidb-dashboard/Dockerfile} (100%) rename dockerfiles/products/tidb-dashboard/{le6.5 => lt6.5.12}/Dockerfile (100%) create mode 100644 dockerfiles/products/tidb-dashboard/~6.5.12/Dockerfile rename dockerfiles/products/{tidb-tools.Dockerfile => tidb-tools/Dockerfile} (100%) rename dockerfiles/products/tidb-tools/{le6.5 => lt6.5.12}/Dockerfile (100%) create mode 100644 dockerfiles/products/tidb-tools/~6.5.12/Dockerfile rename dockerfiles/products/{ => tidb}/br.Dockerfile (100%) rename dockerfiles/products/{ => tidb}/dumpling.Dockerfile (100%) rename dockerfiles/products/tidb/{le6.5 => lt6.5.12}/br.Dockerfile (100%) rename dockerfiles/products/tidb/{le6.5 => lt6.5.12}/dumpling.Dockerfile (100%) rename dockerfiles/products/tidb/{le6.5 => lt6.5.12}/tidb-lightning.Dockerfile (100%) rename dockerfiles/products/tidb/{le6.5 => lt6.5.12}/tidb.Dockerfile (100%) rename dockerfiles/products/tidb/{le6.5 => lt6.5.12}/tidb.enterprise.Dockerfile (100%) rename dockerfiles/products/{ => tidb}/tidb-lightning.Dockerfile (100%) rename dockerfiles/products/{ => tidb}/tidb.Dockerfile (100%) rename dockerfiles/products/{tidb-enterprise.Dockerfile => tidb/tidb.enterprise.Dockerfile} (100%) create mode 100644 dockerfiles/products/tidb/~6.5.12/br.Dockerfile create mode 100644 dockerfiles/products/tidb/~6.5.12/dumpling.Dockerfile rename dockerfiles/products/{tidb-lightning-debug.Dockerfile => tidb/~6.5.12/tidb-lightning.Dockerfile} (99%) rename dockerfiles/products/{tidb-release-6.5.Dockerfile => tidb/~6.5.12/tidb.Dockerfile} (55%) rename dockerfiles/products/{tidb-enterprise-release-6.5.Dockerfile => tidb/~6.5.12/tidb.enterprise.Dockerfile} (71%) rename dockerfiles/products/{tiflash.Dockerfile => tiflash/Dockerfile} (100%) rename dockerfiles/products/tiflash/{le6.5 => lt6.5.12}/Dockerfile (100%) create mode 100644 dockerfiles/products/tiflash/~6.5.12/Dockerfile rename dockerfiles/products/{ => tiflow}/dm.Dockerfile (100%) rename dockerfiles/products/tiflow/{le6.5 => lt6.5.12}/dm.Dockerfile (100%) rename dockerfiles/products/tiflow/{le6.5 => lt6.5.12}/ticdc.Dockerfile (100%) rename dockerfiles/products/{ => tiflow}/ticdc.Dockerfile (100%) create mode 100644 dockerfiles/products/tiflow/~6.5.12/dm.Dockerfile create mode 100644 dockerfiles/products/tiflow/~6.5.12/ticdc.Dockerfile rename dockerfiles/products/{tikv.Dockerfile => tikv/Dockerfile} (100%) rename dockerfiles/products/{tikv-fips.Dockerfile => tikv/fips.Dockerfile} (100%) rename dockerfiles/products/tikv/{le6.5 => lt6.5.12}/Dockerfile (100%) create mode 100644 dockerfiles/products/tikv/~6.5.12/Dockerfile diff --git a/.github/scripts/ci.sh b/.github/scripts/ci.sh index 6709bc6e..435108d4 100755 --- a/.github/scripts/ci.sh +++ b/.github/scripts/ci.sh @@ -2,7 +2,7 @@ set -euo pipefail function test_get_builder() { - local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.0" + local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.12 v6.5.11 v6.5.0 v6.1.0" local operating_systems="linux darwin" local architectures="amd64 arm64" local script="./packages/scripts/get-package-builder-with-config.sh" @@ -33,20 +33,6 @@ function test_get_builder() { done done done - - # # experiment profile - # local components="tidb tiflow tiflash tikv pd ctl monitoring ng-monitoring tidb-tools" - # local versions="v8.5.0 v8.4.0" - # for cm in $components; do - # for version in $versions; do - # for os in $operating_systems; do - # for ac in $architectures; do - # echo -en "[🚢] $cm $os $ac $version experiment:\t" - # $script $cm $os $ac $version experiment - # done - # done - # done - # done } ##### others that owns theirs non-unified versions ##### @@ -100,7 +86,7 @@ function test_get_builder_freedom_releasing() { } function test_gen_package_artifacts_script() { - local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.0" + local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.12 v6.5.11 v6.5.0 v6.1.0" local operating_systems="linux darwin" local architectures="amd64 arm64" local script="./packages/scripts/gen-package-artifacts-with-config.sh" @@ -204,7 +190,7 @@ function test_gen_package_artifacts_script_freedom_releasing() { } function test_gen_package_images_script() { - local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.0" + local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.12 v6.5.11 v6.5.0 v6.1.0" local os="linux" local architectures="amd64 arm64" local script="./packages/scripts/gen-package-images-with-config.sh" @@ -234,20 +220,6 @@ function test_gen_package_images_script() { done done done - - # # experiment profile - # local profile="experiment" - # local versions="v8.5.0 v8.4.0" - # local components="tidb tiflow tiflash tikv pd ctl monitoring ng-monitoring tidb-tools" - # for cm in $components; do - # for version in $versions; do - # for ac in $architectures; do - # echo -en "[📃💿] $cm $os $ac $version $profile:\t" - # $script $cm $os $ac $version $profile branch-xxx 123456789abcdef - # shellcheck -S error packages/scripts/build-package-images.sh - # done - # done - # done } function test_gen_package_images_script_freedom_releasing() { @@ -299,7 +271,7 @@ function test_gen_package_images_script_freedom_releasing() { } function test_gen_offline_package_artifacts_script() { - local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.0 v6.1.0" + local versions="v8.4.0 v8.3.0 v8.2.0 v8.1.0 v8.0.0 v7.5.0 v7.1.0 v6.5.12 v6.5.11 v6.5.0 v6.1.0" local operating_systems="linux" local architectures="amd64 arm64" local editions="community enterprise dm" diff --git a/dockerfiles/products/le6.5-linux-amd64-debug/tiem b/dockerfiles/products/le6.5-linux-amd64-debug/tiem deleted file mode 100644 index 851ce487..00000000 --- a/dockerfiles/products/le6.5-linux-amd64-debug/tiem +++ /dev/null @@ -1,15 +0,0 @@ -FROM centos:centos7.9.2009 -WORKDIR /usr/local/tiem -RUN mkdir bin \ - && mkdir etc \ - && mkdir logs \ - && mkdir scripts \ - && mkdir docs -COPY bin/tiupcmd ./bin -COPY bin/brcmd ./bin -COPY bin/openapi-server ./bin -COPY bin/cluster-server ./bin -COPY bin/metadb-server ./bin -COPY build_helper/docker_start_cmd.sh ./scripts -EXPOSE 4116 -ENTRYPOINT ["/bin/bash", "/usr/local/tiem/scripts/docker_start_cmd.sh"] diff --git a/dockerfiles/products/le6.5-linux-amd64/tiem b/dockerfiles/products/le6.5-linux-amd64/tiem deleted file mode 100644 index 6b41824b..00000000 --- a/dockerfiles/products/le6.5-linux-amd64/tiem +++ /dev/null @@ -1,15 +0,0 @@ -FROM pingcap/alpine-glibc:alpine-3.14.6 -WORKDIR /usr/local/tiem -RUN mkdir bin \ - && mkdir etc \ - && mkdir logs \ - && mkdir scripts \ - && mkdir docs -COPY bin/tiupcmd ./bin -COPY bin/brcmd ./bin -COPY bin/openapi-server ./bin -COPY bin/cluster-server ./bin -COPY bin/metadb-server ./bin -COPY build_helper/docker_start_cmd.sh ./scripts -EXPOSE 4116 -ENTRYPOINT ["/bin/bash", "/usr/local/tiem/scripts/docker_start_cmd.sh"] diff --git a/dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer b/dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer deleted file mode 100644 index 04d5a667..00000000 --- a/dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer +++ /dev/null @@ -1,11 +0,0 @@ -FROM busybox - -ADD init.sh /usr/bin/init.sh -RUN chmod +x /usr/bin/init.sh - -COPY dashboards/*.json /tmp/ -COPY rules/*.rules.yml /tmp/ -COPY datasources/*.yaml /tmp/ - -ENTRYPOINT ["/usr/bin/init.sh"] -CMD ["TIDB-Cluster", "/grafana-dashboard-definitions/tidb/", "false", "/etc/prometheus"] diff --git a/dockerfiles/products/le6.5-linux-arm64/tidb-operator b/dockerfiles/products/le6.5-linux-arm64/tidb-operator deleted file mode 100644 index c9278d6e..00000000 --- a/dockerfiles/products/le6.5-linux-arm64/tidb-operator +++ /dev/null @@ -1,7 +0,0 @@ -FROM arm64v8/alpine:3.10 - -RUN apk add tzdata --no-cache -ADD bin/tidb-scheduler /usr/local/bin/tidb-scheduler -ADD bin/tidb-discovery /usr/local/bin/tidb-discovery -ADD bin/tidb-controller-manager /usr/local/bin/tidb-controller-manager -ADD bin/tidb-admission-webhook /usr/local/bin/tidb-admission-webhook diff --git a/dockerfiles/products/ng-monitoring.Dockerfile b/dockerfiles/products/ng-monitoring/Dockerfile similarity index 100% rename from dockerfiles/products/ng-monitoring.Dockerfile rename to dockerfiles/products/ng-monitoring/Dockerfile diff --git a/dockerfiles/products/ng-monitoring/le6.5/Dockerfile b/dockerfiles/products/ng-monitoring/lt6.5.12/Dockerfile similarity index 62% rename from dockerfiles/products/ng-monitoring/le6.5/Dockerfile rename to dockerfiles/products/ng-monitoring/lt6.5.12/Dockerfile index 68fab15a..d6d3b8a3 100644 --- a/dockerfiles/products/ng-monitoring/le6.5/Dockerfile +++ b/dockerfiles/products/ng-monitoring/lt6.5.12/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.0.1-old +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.2 FROM $BASE_IMG COPY ng-monitoring-server /ng-monitoring-server EXPOSE 12020 diff --git a/dockerfiles/products/ng-monitoring/~6.5.12/Dockerfile b/dockerfiles/products/ng-monitoring/~6.5.12/Dockerfile new file mode 100644 index 00000000..d6d3b8a3 --- /dev/null +++ b/dockerfiles/products/ng-monitoring/~6.5.12/Dockerfile @@ -0,0 +1,5 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.2 +FROM $BASE_IMG +COPY ng-monitoring-server /ng-monitoring-server +EXPOSE 12020 +ENTRYPOINT ["/ng-monitoring-server"] diff --git a/dockerfiles/products/pd.Dockerfile b/dockerfiles/products/pd/Dockerfile similarity index 100% rename from dockerfiles/products/pd.Dockerfile rename to dockerfiles/products/pd/Dockerfile diff --git a/dockerfiles/products/pd/le6.5/Dockerfile b/dockerfiles/products/pd/lt6.5.12/Dockerfile similarity index 100% rename from dockerfiles/products/pd/le6.5/Dockerfile rename to dockerfiles/products/pd/lt6.5.12/Dockerfile diff --git a/dockerfiles/products/pd/~6.5.12/Dockerfile b/dockerfiles/products/pd/~6.5.12/Dockerfile new file mode 100644 index 00000000..a92229ed --- /dev/null +++ b/dockerfiles/products/pd/~6.5.12/Dockerfile @@ -0,0 +1,7 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.2 +FROM $BASE_IMG +COPY pd-server /pd-server +COPY pd-ctl /pd-ctl +COPY pd-recover /pd-recover +EXPOSE 2379 2380 +ENTRYPOINT ["/pd-server"] diff --git a/dockerfiles/products/tidb-binlog.Dockerfile b/dockerfiles/products/tidb-binlog/Dockerfile similarity index 100% rename from dockerfiles/products/tidb-binlog.Dockerfile rename to dockerfiles/products/tidb-binlog/Dockerfile diff --git a/dockerfiles/products/tidb-binlog/le6.5/Dockerfile b/dockerfiles/products/tidb-binlog/lt6.5.12/Dockerfile similarity index 100% rename from dockerfiles/products/tidb-binlog/le6.5/Dockerfile rename to dockerfiles/products/tidb-binlog/lt6.5.12/Dockerfile diff --git a/dockerfiles/products/tidb-binlog/~6.5.12/Dockerfile b/dockerfiles/products/tidb-binlog/~6.5.12/Dockerfile new file mode 100644 index 00000000..533c7534 --- /dev/null +++ b/dockerfiles/products/tidb-binlog/~6.5.12/Dockerfile @@ -0,0 +1,9 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 +FROM $BASE_IMG +COPY pump /pump +COPY drainer /drainer +COPY reparo /reparo +COPY binlogctl /binlogctl +EXPOSE 4000 +EXPOSE 8249 8250 +CMD ["/pump"] diff --git a/dockerfiles/products/tidb-dashboard.Dockerfile b/dockerfiles/products/tidb-dashboard/Dockerfile similarity index 100% rename from dockerfiles/products/tidb-dashboard.Dockerfile rename to dockerfiles/products/tidb-dashboard/Dockerfile diff --git a/dockerfiles/products/tidb-dashboard/le6.5/Dockerfile b/dockerfiles/products/tidb-dashboard/lt6.5.12/Dockerfile similarity index 100% rename from dockerfiles/products/tidb-dashboard/le6.5/Dockerfile rename to dockerfiles/products/tidb-dashboard/lt6.5.12/Dockerfile diff --git a/dockerfiles/products/tidb-dashboard/~6.5.12/Dockerfile b/dockerfiles/products/tidb-dashboard/~6.5.12/Dockerfile new file mode 100644 index 00000000..dd80ebf3 --- /dev/null +++ b/dockerfiles/products/tidb-dashboard/~6.5.12/Dockerfile @@ -0,0 +1,5 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.2 +FROM $BASE_IMG +COPY tidb-dashboard /tidb-dashboard +EXPOSE 12333 +ENTRYPOINT ["/tidb-dashboard"] diff --git a/dockerfiles/products/tidb-tools.Dockerfile b/dockerfiles/products/tidb-tools/Dockerfile similarity index 100% rename from dockerfiles/products/tidb-tools.Dockerfile rename to dockerfiles/products/tidb-tools/Dockerfile diff --git a/dockerfiles/products/tidb-tools/le6.5/Dockerfile b/dockerfiles/products/tidb-tools/lt6.5.12/Dockerfile similarity index 100% rename from dockerfiles/products/tidb-tools/le6.5/Dockerfile rename to dockerfiles/products/tidb-tools/lt6.5.12/Dockerfile diff --git a/dockerfiles/products/tidb-tools/~6.5.12/Dockerfile b/dockerfiles/products/tidb-tools/~6.5.12/Dockerfile new file mode 100644 index 00000000..be2438c1 --- /dev/null +++ b/dockerfiles/products/tidb-tools/~6.5.12/Dockerfile @@ -0,0 +1,3 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 +FROM $BASE_IMG +COPY sync_diff_inspector /sync_diff_inspector diff --git a/dockerfiles/products/br.Dockerfile b/dockerfiles/products/tidb/br.Dockerfile similarity index 100% rename from dockerfiles/products/br.Dockerfile rename to dockerfiles/products/tidb/br.Dockerfile diff --git a/dockerfiles/products/dumpling.Dockerfile b/dockerfiles/products/tidb/dumpling.Dockerfile similarity index 100% rename from dockerfiles/products/dumpling.Dockerfile rename to dockerfiles/products/tidb/dumpling.Dockerfile diff --git a/dockerfiles/products/tidb/le6.5/br.Dockerfile b/dockerfiles/products/tidb/lt6.5.12/br.Dockerfile similarity index 100% rename from dockerfiles/products/tidb/le6.5/br.Dockerfile rename to dockerfiles/products/tidb/lt6.5.12/br.Dockerfile diff --git a/dockerfiles/products/tidb/le6.5/dumpling.Dockerfile b/dockerfiles/products/tidb/lt6.5.12/dumpling.Dockerfile similarity index 100% rename from dockerfiles/products/tidb/le6.5/dumpling.Dockerfile rename to dockerfiles/products/tidb/lt6.5.12/dumpling.Dockerfile diff --git a/dockerfiles/products/tidb/le6.5/tidb-lightning.Dockerfile b/dockerfiles/products/tidb/lt6.5.12/tidb-lightning.Dockerfile similarity index 100% rename from dockerfiles/products/tidb/le6.5/tidb-lightning.Dockerfile rename to dockerfiles/products/tidb/lt6.5.12/tidb-lightning.Dockerfile diff --git a/dockerfiles/products/tidb/le6.5/tidb.Dockerfile b/dockerfiles/products/tidb/lt6.5.12/tidb.Dockerfile similarity index 100% rename from dockerfiles/products/tidb/le6.5/tidb.Dockerfile rename to dockerfiles/products/tidb/lt6.5.12/tidb.Dockerfile diff --git a/dockerfiles/products/tidb/le6.5/tidb.enterprise.Dockerfile b/dockerfiles/products/tidb/lt6.5.12/tidb.enterprise.Dockerfile similarity index 100% rename from dockerfiles/products/tidb/le6.5/tidb.enterprise.Dockerfile rename to dockerfiles/products/tidb/lt6.5.12/tidb.enterprise.Dockerfile diff --git a/dockerfiles/products/tidb-lightning.Dockerfile b/dockerfiles/products/tidb/tidb-lightning.Dockerfile similarity index 100% rename from dockerfiles/products/tidb-lightning.Dockerfile rename to dockerfiles/products/tidb/tidb-lightning.Dockerfile diff --git a/dockerfiles/products/tidb.Dockerfile b/dockerfiles/products/tidb/tidb.Dockerfile similarity index 100% rename from dockerfiles/products/tidb.Dockerfile rename to dockerfiles/products/tidb/tidb.Dockerfile diff --git a/dockerfiles/products/tidb-enterprise.Dockerfile b/dockerfiles/products/tidb/tidb.enterprise.Dockerfile similarity index 100% rename from dockerfiles/products/tidb-enterprise.Dockerfile rename to dockerfiles/products/tidb/tidb.enterprise.Dockerfile diff --git a/dockerfiles/products/tidb/~6.5.12/br.Dockerfile b/dockerfiles/products/tidb/~6.5.12/br.Dockerfile new file mode 100644 index 00000000..d5e7975f --- /dev/null +++ b/dockerfiles/products/tidb/~6.5.12/br.Dockerfile @@ -0,0 +1,4 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 +FROM $BASE_IMG + +COPY br /br diff --git a/dockerfiles/products/tidb/~6.5.12/dumpling.Dockerfile b/dockerfiles/products/tidb/~6.5.12/dumpling.Dockerfile new file mode 100644 index 00000000..64f1e078 --- /dev/null +++ b/dockerfiles/products/tidb/~6.5.12/dumpling.Dockerfile @@ -0,0 +1,4 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 +FROM $BASE_IMG + +COPY dumpling /dumpling diff --git a/dockerfiles/products/tidb-lightning-debug.Dockerfile b/dockerfiles/products/tidb/~6.5.12/tidb-lightning.Dockerfile similarity index 99% rename from dockerfiles/products/tidb-lightning-debug.Dockerfile rename to dockerfiles/products/tidb/~6.5.12/tidb-lightning.Dockerfile index d0808505..6de6041a 100644 --- a/dockerfiles/products/tidb-lightning-debug.Dockerfile +++ b/dockerfiles/products/tidb/~6.5.12/tidb-lightning.Dockerfile @@ -1,5 +1,6 @@ ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 FROM $BASE_IMG + COPY tidb-lightning /tidb-lightning COPY tidb-lightning-ctl /tidb-lightning-ctl COPY br /br diff --git a/dockerfiles/products/tidb-release-6.5.Dockerfile b/dockerfiles/products/tidb/~6.5.12/tidb.Dockerfile similarity index 55% rename from dockerfiles/products/tidb-release-6.5.Dockerfile rename to dockerfiles/products/tidb/~6.5.12/tidb.Dockerfile index 8c3bd062..c725390c 100644 --- a/dockerfiles/products/tidb-release-6.5.Dockerfile +++ b/dockerfiles/products/tidb/~6.5.12/tidb.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.8.0-release-6.5 +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.0.1-old FROM $BASE_IMG COPY tidb-server /tidb-server EXPOSE 4000 diff --git a/dockerfiles/products/tidb-enterprise-release-6.5.Dockerfile b/dockerfiles/products/tidb/~6.5.12/tidb.enterprise.Dockerfile similarity index 71% rename from dockerfiles/products/tidb-enterprise-release-6.5.Dockerfile rename to dockerfiles/products/tidb/~6.5.12/tidb.enterprise.Dockerfile index 7464abdd..612950b1 100644 --- a/dockerfiles/products/tidb-enterprise-release-6.5.Dockerfile +++ b/dockerfiles/products/tidb/~6.5.12/tidb.enterprise.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.8.0-release-6.5 +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.9.2 FROM $BASE_IMG COPY tidb-server /tidb-server COPY audit-1.so /plugins/audit-1.so diff --git a/dockerfiles/products/tiflash.Dockerfile b/dockerfiles/products/tiflash/Dockerfile similarity index 100% rename from dockerfiles/products/tiflash.Dockerfile rename to dockerfiles/products/tiflash/Dockerfile diff --git a/dockerfiles/products/tiflash/le6.5/Dockerfile b/dockerfiles/products/tiflash/lt6.5.12/Dockerfile similarity index 100% rename from dockerfiles/products/tiflash/le6.5/Dockerfile rename to dockerfiles/products/tiflash/lt6.5.12/Dockerfile diff --git a/dockerfiles/products/tiflash/~6.5.12/Dockerfile b/dockerfiles/products/tiflash/~6.5.12/Dockerfile new file mode 100644 index 00000000..f1e7c918 --- /dev/null +++ b/dockerfiles/products/tiflash/~6.5.12/Dockerfile @@ -0,0 +1,5 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.2 +FROM $BASE_IMG +ENV LD_LIBRARY_PATH /tiflash +COPY tiflash /tiflash +ENTRYPOINT ["/tiflash/tiflash", "server"] diff --git a/dockerfiles/products/dm.Dockerfile b/dockerfiles/products/tiflow/dm.Dockerfile similarity index 100% rename from dockerfiles/products/dm.Dockerfile rename to dockerfiles/products/tiflow/dm.Dockerfile diff --git a/dockerfiles/products/tiflow/le6.5/dm.Dockerfile b/dockerfiles/products/tiflow/lt6.5.12/dm.Dockerfile similarity index 100% rename from dockerfiles/products/tiflow/le6.5/dm.Dockerfile rename to dockerfiles/products/tiflow/lt6.5.12/dm.Dockerfile diff --git a/dockerfiles/products/tiflow/le6.5/ticdc.Dockerfile b/dockerfiles/products/tiflow/lt6.5.12/ticdc.Dockerfile similarity index 100% rename from dockerfiles/products/tiflow/le6.5/ticdc.Dockerfile rename to dockerfiles/products/tiflow/lt6.5.12/ticdc.Dockerfile diff --git a/dockerfiles/products/ticdc.Dockerfile b/dockerfiles/products/tiflow/ticdc.Dockerfile similarity index 100% rename from dockerfiles/products/ticdc.Dockerfile rename to dockerfiles/products/tiflow/ticdc.Dockerfile diff --git a/dockerfiles/products/tiflow/~6.5.12/dm.Dockerfile b/dockerfiles/products/tiflow/~6.5.12/dm.Dockerfile new file mode 100644 index 00000000..ea2e72ce --- /dev/null +++ b/dockerfiles/products/tiflow/~6.5.12/dm.Dockerfile @@ -0,0 +1,8 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 +FROM $BASE_IMG + +COPY dm-worker /dm-worker +COPY dm-master /dm-master +COPY dmctl /dmctl + +EXPOSE 8291 8261 8262 diff --git a/dockerfiles/products/tiflow/~6.5.12/ticdc.Dockerfile b/dockerfiles/products/tiflow/~6.5.12/ticdc.Dockerfile new file mode 100644 index 00000000..7a7e4aeb --- /dev/null +++ b/dockerfiles/products/tiflow/~6.5.12/ticdc.Dockerfile @@ -0,0 +1,7 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2 +FROM $BASE_IMG + +COPY cdc /cdc + +EXPOSE 8300 +CMD [ "/cdc" ] diff --git a/dockerfiles/products/tikv.Dockerfile b/dockerfiles/products/tikv/Dockerfile similarity index 100% rename from dockerfiles/products/tikv.Dockerfile rename to dockerfiles/products/tikv/Dockerfile diff --git a/dockerfiles/products/tikv-fips.Dockerfile b/dockerfiles/products/tikv/fips.Dockerfile similarity index 100% rename from dockerfiles/products/tikv-fips.Dockerfile rename to dockerfiles/products/tikv/fips.Dockerfile diff --git a/dockerfiles/products/tikv/le6.5/Dockerfile b/dockerfiles/products/tikv/lt6.5.12/Dockerfile similarity index 100% rename from dockerfiles/products/tikv/le6.5/Dockerfile rename to dockerfiles/products/tikv/lt6.5.12/Dockerfile diff --git a/dockerfiles/products/tikv/~6.5.12/Dockerfile b/dockerfiles/products/tikv/~6.5.12/Dockerfile new file mode 100644 index 00000000..19b1dcf0 --- /dev/null +++ b/dockerfiles/products/tikv/~6.5.12/Dockerfile @@ -0,0 +1,6 @@ +ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.0.0-old +FROM $BASE_IMG +COPY tikv-server /tikv-server +COPY tikv-ctl /tikv-ctl +EXPOSE 20160 +ENTRYPOINT ["/tikv-server"] diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index 57808dec..dddc69ce 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -1,4 +1,13 @@ # See README.md + +{{- define "image_dockerfile_folder" -}} +{{- if semver.CheckConstraint "< 6.5.12-0" . -}} +lt6.5.12/ +{{- else if semver.CheckConstraint "~ 6.5.12-0" . -}} +~6.5.12/ +{{- end -}} +{{- end -}} + components: advanced-statefulset: desc: @@ -363,7 +372,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/ng-monitoring/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/Dockerfile files: - name: ng-monitoring-server src: @@ -386,7 +395,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/ng-monitoring/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/Dockerfile files: - name: ng-monitoring-server src: @@ -411,7 +420,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/ng-monitoring/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/Dockerfile files: - name: ng-monitoring-server src: @@ -422,7 +431,7 @@ components: src: path: bin/ng-monitoring-server - - description: From v5.3 until v6.0 + - description: For range [v5.3.0, v6.6.0) if: {{ semver.CheckConstraint ">= 5.3.0-0, < 6.6.0-0" .Release.version }} os: [linux, darwin] arch: [amd64, arm64] @@ -435,7 +444,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/ng-monitoring/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/le6.5/Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: - name: ng-monitoring-server src: @@ -529,11 +538,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/pd/image" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/le6.5/Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/Dockerfile files: # prepare for context - name: pd-server src: @@ -601,7 +606,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/pd/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/Dockerfile files: # prepare for context - name: pd-server src: @@ -645,7 +650,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/pd/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/Dockerfile files: # prepare for context - name: pd-server src: @@ -711,7 +716,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/pd/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/le6.5/Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: # prepare for context - { name: pd-server, src: { path: bin/pd-server } } - { name: pd-ctl, src: { path: bin/pd-ctl } } @@ -843,9 +848,9 @@ components: artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-server" {{- if eq .Release.profile "enterprise" }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-enterprise.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.enterprise.Dockerfile {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.Dockerfile {{- end }} files: # prepare for context - name: tidb-server @@ -863,7 +868,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/br" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/br.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/br.Dockerfile files: # prepare for context - name: br src: @@ -872,7 +877,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/dumpling" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/dumpling.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/dumpling.Dockerfile files: # prepare for context - name: dumpling src: @@ -881,7 +886,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-lightning" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-lightning.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb-lightning.Dockerfile files: # prepare for context - name: tidb-lightning src: @@ -988,9 +993,9 @@ components: artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-server" {{- if eq .Release.profile "enterprise" }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-enterprise.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.enterprise.Dockerfile {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.Dockerfile {{- end }} files: # prepare for context - name: tidb-server @@ -1008,7 +1013,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/br" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/br.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/br.Dockerfile files: # prepare for context - name: br src: @@ -1017,7 +1022,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/dumpling" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/dumpling.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/dumpling.Dockerfile files: # prepare for context - name: dumpling src: @@ -1026,7 +1031,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-lightning" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-lightning.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb-lightning.Dockerfile files: # prepare for context - name: tidb-lightning src: @@ -1132,11 +1137,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-server" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/tidb.Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ template "image_dockerfile_folder" .Release.version }}tidb.Dockerfile files: # prepare for context - name: tidb-server src: @@ -1146,11 +1147,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-server" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-enterprise.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/tidb.enterprise.Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ template "image_dockerfile_folder" .Release.version }}tidb.enterprise.Dockerfile files: # prepare for context - name: tidb-server src: @@ -1165,11 +1162,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/br" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/br.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/br.Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ template "image_dockerfile_folder" .Release.version }}br.Dockerfile files: # prepare for context - name: br src: @@ -1178,11 +1171,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/dumpling" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/dumpling.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/dumpling.Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ template "image_dockerfile_folder" .Release.version }}dumpling.Dockerfile files: # prepare for context - name: dumpling src: @@ -1191,11 +1180,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-lightning" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-lightning.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/tidb-lightning.Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ template "image_dockerfile_folder" .Release.version }}tidb-lightning.Dockerfile files: # prepare for context - name: tidb-lightning src: @@ -1248,11 +1233,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb-tools/image" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-tools.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-tools/le6.5/Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-tools/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: - name: sync_diff_inspector src: @@ -1370,11 +1351,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb-binlog/image" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-binlog.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-binlog/le6.5/Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-binlog/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: # context files - name: pump src: @@ -1546,7 +1523,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb-dashboard/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/Dockerfile files: # prepare for context - name: tidb-dashboard src: @@ -1572,7 +1549,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb-dashboard/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/Dockerfile files: # prepare for context - name: tidb-dashboard src: @@ -1598,7 +1575,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb-dashboard/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/le6.5/Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: # prepare for context - name: tidb-dashboard src: @@ -1621,7 +1598,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tidb-dashboard/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/Dockerfile files: # prepare for context - name: tidb-dashboard src: @@ -1691,11 +1668,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflash/image" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/le6.5/Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/Dockerfile files: - name: tiflash/ src: @@ -1792,11 +1765,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflash/image" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/le6.5/Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: - name: tiflash/ src: @@ -1924,7 +1893,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflow/images/cdc" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ticdc.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/{{ template "image_dockerfile_folder" .Release.version }}ticdc.Dockerfile files: # context files - name: cdc src: @@ -1933,7 +1902,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflow/images/dm" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/dm.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/{{ template "image_dockerfile_folder" .Release.version }}dm.Dockerfile files: - name: dm-master src: @@ -1975,7 +1944,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflow/images/cdc" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ticdc.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/~6.5.12/ticdc.Dockerfile # same as new base. files: # context files - name: cdc src: @@ -2075,7 +2044,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflow/images/cdc" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/le6.5/ticdc.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/lt6.5.12/ticdc.Dockerfile files: # context files - name: cdc src: @@ -2084,7 +2053,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/pingcap/tiflow/images/dm" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/le6.5/dm.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/lt6.5.12/dm.Dockerfile files: - name: dm-master src: @@ -2217,7 +2186,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/tikv/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv/Dockerfile files: - { name: tikv-server, src: { path: bin/tikv-server } } - { name: tikv-ctl, src: { path: bin/tikv-ctl } } @@ -2280,11 +2249,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/tikv/image" - {{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv.Dockerfile - {{- else }} - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv/le6.5/Dockerfile - {{- end }} + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv/{{ template "image_dockerfile_folder" .Release.version }}Dockerfile files: # prepare for context - { name: tikv-server, src: { path: bin/tikv-server } } - { name: tikv-ctl, src: { path: bin/tikv-ctl } } @@ -2312,7 +2277,7 @@ components: type: image artifactory: repo: "{{ .Release.registry }}/tikv/tikv/image" - dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv-fips.Dockerfile + dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv/fips.Dockerfile files: # prepare for context - { name: tikv-server, src: { path: bin/tikv-server } } - { name: tikv-ctl, src: { path: bin/tikv-ctl } }