From 0ff37582873da89d08b71dcd3687d6862f1e1099 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 29 Jul 2024 20:11:39 +0800 Subject: [PATCH 1/4] fix(packages): update packages.yaml.tmpl prepare file `br` to build image tidb-ligntning of release-6.5 Signed-off-by: wuhuizuo --- packages/packages.yaml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index a6f13270..4a751e31 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -865,10 +865,10 @@ components: {{- end }} files: # prepare for context - name: tidb-lightning - src: + src: path: bin/tidb-lightning - name: tidb-lightning-ctl - src: + src: path: bin/tidb-lightning-ctl - name: br if: {{ semver.CheckConstraint "< 6.6.0-0" .Release.version }} From 00c8019778df58705e948c2f6b48f8826c056793 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 30 Jul 2024 20:29:40 +0800 Subject: [PATCH 2/4] fix(dockerfiles/bases): upgrade pkgs to fix security issues Signed-off-by: wuhuizuo --- dockerfiles/bases/pingcap-base/Dockerfile | 3 +-- dockerfiles/bases/skaffold.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dockerfiles/bases/pingcap-base/Dockerfile b/dockerfiles/bases/pingcap-base/Dockerfile index aac9e75b..10ac5923 100644 --- a/dockerfiles/bases/pingcap-base/Dockerfile +++ b/dockerfiles/bases/pingcap-base/Dockerfile @@ -1,4 +1,3 @@ FROM quay.io/rockylinux/rockylinux:9.4.20240523 COPY --from=busybox:1.36.1 /bin/busybox /bin/busybox -RUN dnf upgrade -y python3 less && \ - dnf clean all +RUN _date=20240730 dnf upgrade -y && dnf clean all diff --git a/dockerfiles/bases/skaffold.yaml b/dockerfiles/bases/skaffold.yaml index f7b1f489..ac501072 100644 --- a/dockerfiles/bases/skaffold.yaml +++ b/dockerfiles/bases/skaffold.yaml @@ -60,7 +60,7 @@ build: cache: {} tagPolicy: customTemplate: - template: "v1.9.0" + template: "v1.9.1" cluster: concurrency: 0 randomDockerConfigSecret: false From c4c7ba1ae340b41f53e695df17e3745c024f0a7f Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 30 Jul 2024 20:44:36 +0800 Subject: [PATCH 3/4] Update packages/packages.yaml.tmpl --- packages/packages.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index 4a751e31..5108df85 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -865,7 +865,7 @@ components: {{- end }} files: # prepare for context - name: tidb-lightning - src: + src: path: bin/tidb-lightning - name: tidb-lightning-ctl src: From 7d9080e721a31ad6fdbc6fff6cad81712109089f Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 30 Jul 2024 20:44:51 +0800 Subject: [PATCH 4/4] Update packages/packages.yaml.tmpl --- packages/packages.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index 5108df85..a6f13270 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -868,7 +868,7 @@ components: src: path: bin/tidb-lightning - name: tidb-lightning-ctl - src: + src: path: bin/tidb-lightning-ctl - name: br if: {{ semver.CheckConstraint "< 6.6.0-0" .Release.version }}