feat(dockerfiles/cd/builders): add other golang 1.23 builder images (#…

…430) Signed-off-by: wuhuizuo <wuhuizuo@126.com> --------- Signed-off-by: wuhuizuo <wuhuizuo@126.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
PingCAP-QE · Sep 23, 2024 · 84787ec · 84787ec
1 parent f092cd5
commit 84787ec
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 64 deletions.
diff --git a/.github/workflows/pull-cd-builder-images.yaml b/.github/workflows/pull-cd-builder-images.yaml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Cache layers
@@ -112,7 +112,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Cache layers

diff --git a/.github/workflows/pull-cd-util-images.yaml b/.github/workflows/pull-cd-util-images.yaml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Build images

diff --git a/.github/workflows/pull-ci-runtime-images.yaml b/.github/workflows/pull-ci-runtime-images.yaml
@@ -49,7 +49,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Cache layers

diff --git a/.github/workflows/pull-prod-runtime-images.yaml b/.github/workflows/pull-prod-runtime-images.yaml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Setup manifest-tool

diff --git a/.github/workflows/release-cd-builder-images.yaml b/.github/workflows/release-cd-builder-images.yaml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Cache layers
@@ -103,7 +103,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Cache layers

diff --git a/.github/workflows/release-cd-util-images.yaml b/.github/workflows/release-cd-util-images.yaml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Publish images

diff --git a/.github/workflows/release-ci-runtime-images.yaml b/.github/workflows/release-ci-runtime-images.yaml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Cache layers

diff --git a/.github/workflows/release-prod-runtime-images.yaml b/.github/workflows/release-prod-runtime-images.yaml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Setup skaffold
         run: |
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.13.2/skaffold-linux-amd64 && \
           sudo install skaffold /usr/local/bin/
 
       - name: Setup manifest-tool

diff --git a/Justfile b/Justfile
@@ -27,11 +27,6 @@ msb-tidb-operator: (_clone "tidb-operator" "https://github.com/pingcap/tidb-oper
 
 build_product_base_images: (_docker_build_prod_base_images "hub.pingcap.net/bases")
 
-_msb component git_url git_branch:
-    [ -e ../{{component}} ] || git clone --recurse-submodules {{git_url}} --branch {{git_branch}} ../{{component}}
-    ([ -e ../{{component}}/.dockerignore ] && rm ../{{component}}/.dockerignore) || true # make step depended on git metadata.
-    docker build -t {{component}} -f dockerfiles-multi-stages/{{component}}/Dockerfile ../{{component}}
-
 _clone component git_url git_branch:
     [ -e ../{{component}} ] || git clone --recurse-submodules -j8 {{git_url}} --branch {{git_branch}} ../{{component}}
     ([ -e ../{{component}}/.dockerignore ] && rm ../{{component}}/.dockerignore) || true # make step depended on git metadata.

diff --git a/dockerfiles-multi-stages/tiflash/Dockerfile b/dockerfiles-multi-stages/tiflash/Dockerfile
diff --git a/dockerfiles/cd/builders/skaffold.yaml b/dockerfiles/cd/builders/skaffold.yaml
@@ -176,6 +176,13 @@ build:
         dockerfile: tidb-operator/Dockerfile
         cache: {}
         target: builder
+  tagPolicy:
+    customTemplate:
+      template: "{{ .SHA }}"
+      components:
+        - name: SHA
+          gitCommit:
+            variant: Tags
   cluster:
     concurrency: 0
     randomDockerConfigSecret: false
@@ -197,6 +204,44 @@ profiles:
     patches:
       - { op: move, from: /build/artifacts/0/kaniko, path: /build/artifacts/0/docker }
       - { op: move, from: /build/artifacts/1/kaniko, path: /build/artifacts/1/docker }
+  - name: go-1.23
+    patches:
+      - op: replace
+        path: /build/tagPolicy/customTemplate/template
+        value: "{{ .SHA }}-go1.23"
+      - op: add
+        path: /build/artifacts/0/kaniko/buildArgs
+        value: &value-go1-23
+          # renovate: datasource=docker depName=golang
+          GOLANG_VERSION: 1.23.1
+      - op: add
+        path: /build/artifacts/1/kaniko/buildArgs
+        value: *value-go1-23
+  - name: go-1.22
+    patches:
+      - op: replace
+        path: /build/tagPolicy/customTemplate/template
+        value: "{{ .SHA }}-go1.23"
+      - op: add
+        path: /build/artifacts/0/kaniko/buildArgs
+        value: &value-go1-22
+          # renovate: datasource=docker depName=golang
+          GOLANG_VERSION: 1.22.7
+      - op: add
+        path: /build/artifacts/1/kaniko/buildArgs
+        value: *value-go1-22
+  - name: go-1.21
+    patches:
+      - op: replace
+        path: /build/tagPolicy/customTemplate/template
+        value: "{{ .SHA }}-go1.23"
+      - op: add
+        path: /build/artifacts/0/kaniko/buildArgs
+        value: &value-go1-21
+          GOLANG_VERSION: 1.21.13
+      - op: add
+        path: /build/artifacts/1/kaniko/buildArgs
+        value: *value-go1-21
 ---
 apiVersion: skaffold/v4beta6
 kind: Config

diff --git a/dockerfiles/cd/builders/tikv/fips.Dockerfile b/dockerfiles/cd/builders/tikv/fips.Dockerfile
@@ -6,7 +6,7 @@
 #   - docker build -t tikv -f Dockerfile ./tikv
 
 ########### stage: builder
-FROM rockylinux:9.3.20231119 as builder
+FROM quay.io/rockylinux/rockylinux:9.4.20240523 as builder
 LABEL org.opencontainers.image.authors "wuhui.zuo@pingcap.com"
 LABEL org.opencontainers.image.description "binary builder for TiKV with FIPS support"
 LABEL org.opencontainers.image.source "https://github.com/PingCAP-QE/artifacts"
@@ -22,10 +22,10 @@ RUN dnf install -y \
   git \
   findutils \
   curl \
-  python3 --allowerasing && \
-  dnf --enablerepo=crb install -y \
-  libstdc++-static && \
-  dnf clean all
+  python3 --allowerasing \
+  && dnf --enablerepo=crb install -y libstdc++-static \
+  && dnf clean all \
+  && rm -Rf /var/cache/dnf
 
 # install protoc.
 # renovate: datasource=github-release depName=protocolbuffers/protobuf