From b13db85b2478f26424addfd888258154252a0d8e Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 12 Jun 2024 03:23:08 +0000 Subject: [PATCH] feat(dockerfiles/cd/builders/tikv): add builder image with devtoolset 10 Signed-off-by: wuhuizuo --- .github/workflows/pull-cd-builder-images.yaml | 4 ++-- .github/workflows/release-cd-builder-images.yaml | 4 ++-- dockerfiles/cd/builders/skaffold.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-cd-builder-images.yaml b/.github/workflows/pull-cd-builder-images.yaml index 6338a9b4..30c4e6e5 100644 --- a/.github/workflows/pull-cd-builder-images.yaml +++ b/.github/workflows/pull-cd-builder-images.yaml @@ -96,7 +96,7 @@ jobs: builder-profile: devtoolset9,local-docker platform: linux/amd64 - module: builder-tikv - builder-profile: devtoolset11,local-docker + builder-profile: devtoolset10,local-docker platform: linux/amd64 - module: builder-tikv builder-profile: devtoolset8,local-docker @@ -105,7 +105,7 @@ jobs: builder-profile: devtoolset9,local-docker platform: linux/arm64 - module: builder-tikv - builder-profile: devtoolset11,local-docker + builder-profile: devtoolset10,local-docker platform: linux/arm64 steps: - name: Checkout sources diff --git a/.github/workflows/release-cd-builder-images.yaml b/.github/workflows/release-cd-builder-images.yaml index aa9c6492..b60327cb 100644 --- a/.github/workflows/release-cd-builder-images.yaml +++ b/.github/workflows/release-cd-builder-images.yaml @@ -84,8 +84,8 @@ jobs: builder-profile: devtoolset8,local-docker - module: builder-tikv builder-profile: devtoolset9,local-docker - # - module: builder-tikv - # builder-profile: devtoolset11,local-docker + - module: builder-tikv + builder-profile: devtoolset10,local-docker steps: - name: Checkout sources uses: actions/checkout@v4 diff --git a/dockerfiles/cd/builders/skaffold.yaml b/dockerfiles/cd/builders/skaffold.yaml index 2b44cb9f..970d08e9 100644 --- a/dockerfiles/cd/builders/skaffold.yaml +++ b/dockerfiles/cd/builders/skaffold.yaml @@ -211,15 +211,15 @@ profiles: path: /build/artifacts/0/kaniko/buildArgs value: DEVTOOLSET_VER: 9 - - name: devtoolset11 + - name: devtoolset10 patches: - op: replace path: /build/tagPolicy/customTemplate/template - value: "{{ .SHA }}-devtoolset11" + value: "{{ .SHA }}-devtoolset10" - op: add path: /build/artifacts/0/kaniko/buildArgs value: - DEVTOOLSET_VER: 11 + DEVTOOLSET_VER: 10 --- apiVersion: skaffold/v4beta6 kind: Config