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 <[email protected]>
PingCAP-QE · Oct 21, 2024 · b640808 · b640808
1 parent 26105b4
commit b640808
Show file tree

Hide file tree

Showing 49 changed files with 120 additions and 167 deletions.
diff --git 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
diff --git a/dockerfiles/products/le6.5-linux-amd64/tiem b/dockerfiles/products/le6.5-linux-amd64/tiem
diff --git a/dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer b/dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer
diff --git a/dockerfiles/products/le6.5-linux-arm64/tidb-operator b/dockerfiles/products/le6.5-linux-arm64/tidb-operator
diff --git a/...erfiles/products/ng-monitoring.Dockerfile → ...erfiles/products/ng-monitoring/Dockerfile b/...erfiles/products/ng-monitoring.Dockerfile → ...erfiles/products/ng-monitoring/Dockerfile
diff --git a/...s/products/ng-monitoring/le6.5/Dockerfile → ...roducts/ng-monitoring/lt6.5.12/Dockerfile b/...s/products/ng-monitoring/le6.5/Dockerfile → ...roducts/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
@@ -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 → dockerfiles/products/pd/Dockerfile b/dockerfiles/products/pd.Dockerfile → dockerfiles/products/pd/Dockerfile
diff --git a/dockerfiles/products/pd/le6.5/Dockerfile → dockerfiles/products/pd/lt6.5.12/Dockerfile b/dockerfiles/products/pd/le6.5/Dockerfile → 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
@@ -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 → dockerfiles/products/tidb-binlog/Dockerfile b/dockerfiles/products/tidb-binlog.Dockerfile → dockerfiles/products/tidb-binlog/Dockerfile
diff --git a/...les/products/tidb-binlog/le6.5/Dockerfile → .../products/tidb-binlog/lt6.5.12/Dockerfile b/...les/products/tidb-binlog/le6.5/Dockerfile → .../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
@@ -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/...rfiles/products/tidb-dashboard.Dockerfile → ...rfiles/products/tidb-dashboard/Dockerfile b/...rfiles/products/tidb-dashboard.Dockerfile → ...rfiles/products/tidb-dashboard/Dockerfile
diff --git a/.../products/tidb-dashboard/le6.5/Dockerfile → ...oducts/tidb-dashboard/lt6.5.12/Dockerfile b/.../products/tidb-dashboard/le6.5/Dockerfile → ...oducts/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
@@ -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 → dockerfiles/products/tidb-tools/Dockerfile b/dockerfiles/products/tidb-tools.Dockerfile → dockerfiles/products/tidb-tools/Dockerfile
diff --git a/...iles/products/tidb-tools/le6.5/Dockerfile → ...s/products/tidb-tools/lt6.5.12/Dockerfile b/...iles/products/tidb-tools/le6.5/Dockerfile → ...s/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
@@ -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 → dockerfiles/products/tidb/br.Dockerfile b/dockerfiles/products/br.Dockerfile → dockerfiles/products/tidb/br.Dockerfile
diff --git a/dockerfiles/products/dumpling.Dockerfile → ...erfiles/products/tidb/dumpling.Dockerfile b/dockerfiles/products/dumpling.Dockerfile → ...erfiles/products/tidb/dumpling.Dockerfile
diff --git a/...erfiles/products/tidb/le6.5/br.Dockerfile → ...iles/products/tidb/lt6.5.12/br.Dockerfile b/...erfiles/products/tidb/le6.5/br.Dockerfile → ...iles/products/tidb/lt6.5.12/br.Dockerfile
diff --git a/...s/products/tidb/le6.5/dumpling.Dockerfile → ...roducts/tidb/lt6.5.12/dumpling.Dockerfile b/...s/products/tidb/le6.5/dumpling.Dockerfile → ...roducts/tidb/lt6.5.12/dumpling.Dockerfile
diff --git a/...ucts/tidb/le6.5/tidb-lightning.Dockerfile → ...s/tidb/lt6.5.12/tidb-lightning.Dockerfile b/...ucts/tidb/le6.5/tidb-lightning.Dockerfile → ...s/tidb/lt6.5.12/tidb-lightning.Dockerfile
diff --git a/...files/products/tidb/le6.5/tidb.Dockerfile → ...es/products/tidb/lt6.5.12/tidb.Dockerfile b/...files/products/tidb/le6.5/tidb.Dockerfile → ...es/products/tidb/lt6.5.12/tidb.Dockerfile
diff --git a/...cts/tidb/le6.5/tidb.enterprise.Dockerfile → .../tidb/lt6.5.12/tidb.enterprise.Dockerfile b/...cts/tidb/le6.5/tidb.enterprise.Dockerfile → .../tidb/lt6.5.12/tidb.enterprise.Dockerfile
diff --git a/...rfiles/products/tidb-lightning.Dockerfile → ...s/products/tidb/tidb-lightning.Dockerfile b/...rfiles/products/tidb-lightning.Dockerfile → ...s/products/tidb/tidb-lightning.Dockerfile
diff --git a/dockerfiles/products/tidb.Dockerfile → dockerfiles/products/tidb/tidb.Dockerfile b/dockerfiles/products/tidb.Dockerfile → dockerfiles/products/tidb/tidb.Dockerfile
diff --git a/...files/products/tidb-enterprise.Dockerfile → .../products/tidb/tidb.enterprise.Dockerfile b/...files/products/tidb-enterprise.Dockerfile → .../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
@@ -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
@@ -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/.../products/tidb-lightning-debug.Dockerfile → ...ts/tidb/~6.5.12/tidb-lightning.Dockerfile b/.../products/tidb-lightning-debug.Dockerfile → ...ts/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/...iles/products/tidb-release-6.5.Dockerfile → ...les/products/tidb/~6.5.12/tidb.Dockerfile b/...iles/products/tidb-release-6.5.Dockerfile → ...les/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/...ts/tidb-enterprise-release-6.5.Dockerfile → ...s/tidb/~6.5.12/tidb.enterprise.Dockerfile b/...ts/tidb-enterprise-release-6.5.Dockerfile → ...s/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 → dockerfiles/products/tiflash/Dockerfile b/dockerfiles/products/tiflash.Dockerfile → dockerfiles/products/tiflash/Dockerfile
diff --git a/...erfiles/products/tiflash/le6.5/Dockerfile → ...iles/products/tiflash/lt6.5.12/Dockerfile b/...erfiles/products/tiflash/le6.5/Dockerfile → ...iles/products/tiflash/lt6.5.12/Dockerfile
diff --git a/dockerfiles/products/tiflash/~6.5.12/Dockerfile 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 → dockerfiles/products/tiflow/dm.Dockerfile b/dockerfiles/products/dm.Dockerfile → dockerfiles/products/tiflow/dm.Dockerfile
diff --git a/...files/products/tiflow/le6.5/dm.Dockerfile → ...es/products/tiflow/lt6.5.12/dm.Dockerfile b/...files/products/tiflow/le6.5/dm.Dockerfile → ...es/products/tiflow/lt6.5.12/dm.Dockerfile
diff --git a/...es/products/tiflow/le6.5/ticdc.Dockerfile → ...products/tiflow/lt6.5.12/ticdc.Dockerfile b/...es/products/tiflow/le6.5/ticdc.Dockerfile → ...products/tiflow/lt6.5.12/ticdc.Dockerfile
diff --git a/dockerfiles/products/ticdc.Dockerfile → dockerfiles/products/tiflow/ticdc.Dockerfile b/dockerfiles/products/ticdc.Dockerfile → 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
@@ -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
@@ -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 → dockerfiles/products/tikv/Dockerfile b/dockerfiles/products/tikv.Dockerfile → dockerfiles/products/tikv/Dockerfile
diff --git a/dockerfiles/products/tikv-fips.Dockerfile → dockerfiles/products/tikv/fips.Dockerfile b/dockerfiles/products/tikv-fips.Dockerfile → dockerfiles/products/tikv/fips.Dockerfile
diff --git a/dockerfiles/products/tikv/le6.5/Dockerfile → ...erfiles/products/tikv/lt6.5.12/Dockerfile b/dockerfiles/products/tikv/le6.5/Dockerfile → ...erfiles/products/tikv/lt6.5.12/Dockerfile
diff --git a/dockerfiles/products/tikv/~6.5.12/Dockerfile 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"]