update dockerfiles and workflows

stoneshi-yunify · stoneshi-yunify · commit 7b4f3d57bbbf · 2025-03-06T16:56:47.000+08:00
Signed-off-by: stoneshi-yunify &lt;stoneshi@kubesphere.io&gt;
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -50,7 +50,7 @@ runs:
       uses: docker/metadata-action@v3.7.0
       with:
         images: |
-          kubespheredev/${{ inputs.image-name }}
+          kubesphere/${{ inputs.image-name }}
         tags: |
           type=ref,event=branch,suffix=${{ inputs.tag-suffix }}
           type=ref,event=pr,suffix=${{ inputs.tag-suffix }}
diff --git a/.github/workflows/build-podman.yaml b/.github/workflows/build-podman.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   BuildBase:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Build base agent
@@ -23,168 +23,3 @@ jobs:
           platforms: linux/amd64,linux/arm64
           docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
           docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildGo:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/podman/Dockerfile
-        image-name: builder-go
-        tag-suffix: -podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.12.10"
-  BuildGo16:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go 1.16 agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/podman/Dockerfile
-        image-name: builder-go
-        tag-suffix: -1.16-podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.16.8"
-  BuildGo17:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go 1.17 agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/podman/Dockerfile
-        image-name: builder-go
-        tag-suffix: -1.17-podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.17.8"
-  BuildGo18:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go 1.18 agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/podman/Dockerfile
-        image-name: builder-go
-        tag-suffix: -1.18-podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.18"
-
-  BuildMaven:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build maven agent
-      uses: ./.github/actions/build
-      with:
-        context: maven
-        dockerfile: maven/podman/Dockerfile
-        image-name: builder-maven
-        tag-suffix: -podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "JDK_VERSION=1.8.0"
-  BuildMavenJDK11:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build maven(JDK11) agent
-      uses: ./.github/actions/build
-      with:
-        context: maven
-        dockerfile: maven/podman/Dockerfile
-        image-name: builder-maven
-        tag-suffix: -jdk11-podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "JDK_VERSION=11"
-
-  BuildMavenJDK17:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build maven(JDK17) agent
-        uses: ./.github/actions/build
-        with:
-          context: maven
-          dockerfile: maven/podman/Dockerfile
-          image-name: builder-maven
-          tag-suffix: -jdk17-podman
-          platforms: linux/amd64,linux/arm64
-          docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-          docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-          build-args: |
-            "JDK_VERSION=17"
-            "JDK_HOME=/usr/java/default"
-
-  BuildGradle:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Gradle agent
-      uses: ./.github/actions/build
-      with:
-        context: gradle
-        dockerfile: gradle/podman/Dockerfile
-        image-name: builder-gradle
-        tag-suffix: -podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildNodeJs:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build NodeJS agent
-      uses: ./.github/actions/build
-      with:
-        context: nodejs
-        dockerfile: nodejs/podman/Dockerfile
-        image-name: builder-nodejs
-        tag-suffix: -podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildPython:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Python agent
-      uses: ./.github/actions/build
-      with:
-        context: python
-        dockerfile: python/podman/Dockerfile
-        image-name: builder-python
-        tag-suffix: -podman
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   BuildBase:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Build base agent
@@ -22,177 +22,3 @@ jobs:
           platforms: linux/amd64,linux/arm64
           docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
           docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildGo:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/Dockerfile
-        image-name: builder-go
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.12.10"
-  BuildGo16:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go 1.16 agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/Dockerfile
-        image-name: builder-go
-        tag-suffix: -1.16
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.16.8"
-  BuildGo17:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go 1.17 agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/Dockerfile
-        image-name: builder-go
-        tag-suffix: -1.17
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.17.8"
-  BuildGo18:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Go 1.18 agent
-      uses: ./.github/actions/build
-      with:
-        context: go
-        dockerfile: go/Dockerfile
-        image-name: builder-go
-        tag-suffix: -1.18
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "GOLANG_VERSION=1.18"
-
-  BuildMaven:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build maven agent
-      uses: ./.github/actions/build
-      with:
-        context: maven
-        dockerfile: maven/Dockerfile
-        image-name: builder-maven
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "JDK_VERSION=1.8.0"
-  BuildMavenJDK11:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build maven(JDK11) agent
-      uses: ./.github/actions/build
-      with:
-        context: maven
-        dockerfile: maven/Dockerfile
-        image-name: builder-maven
-        tag-suffix: -jdk11
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-        build-args: "JDK_VERSION=11"
-  BuildMavenJDK17:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build maven(JDK17) agent
-        uses: ./.github/actions/build
-        with:
-          context: maven
-          dockerfile: maven/Dockerfile
-          image-name: builder-maven
-          tag-suffix: -jdk17
-          platforms: linux/amd64,linux/arm64
-          docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-          docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-          build-args: |
-            "JDK_VERSION=17"
-            "JDK_HOME=/usr/java/default"
-
-  BuildGradle:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Gradle agent
-      uses: ./.github/actions/build
-      with:
-        context: gradle
-        dockerfile: gradle/Dockerfile
-        image-name: builder-gradle
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildNodeJs:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build NodeJS agent
-      uses: ./.github/actions/build
-      with:
-        context: nodejs
-        dockerfile: nodejs/Dockerfile
-        image-name: builder-nodejs
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildDotnet:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build DotNet agent
-      uses: ./.github/actions/build
-      with:
-        context: dotnet
-        dockerfile: dotnet/Dockerfile
-        image-name: builder-dotnet
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
-
-  BuildPython:
-    needs: BuildBase
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Python agent
-      uses: ./.github/actions/build
-      with:
-        context: python
-        dockerfile: python/Dockerfile
-        image-name: builder-python
-        platforms: linux/amd64,linux/arm64
-        docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
-        docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM kubespheredev/builder-base:v3.2.2
+FROM kubespheredev/builder-base:v3.3.1
 
 WORKDIR /home/jenkins
 
diff --git a/base/podman/Dockerfile b/base/podman/Dockerfile
@@ -1,4 +1,4 @@
-FROM kubesphere/builder-base:v3.2.2-podman
+FROM kubesphere/builder-base:v3.3.1-podman
 
 WORKDIR /home/jenkins
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM kubespheredev/builder-base:v3.2.2`
	`1`	`+FROM kubespheredev/builder-base:v3.3.1`
`2`	`2`
`3`	`3`	`WORKDIR /home/jenkins`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM kubesphere/builder-base:v3.2.2-podman`
	`1`	`+FROM kubesphere/builder-base:v3.3.1-podman`
`2`	`2`
`3`	`3`	`WORKDIR /home/jenkins`
`4`	`4`