diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a7907b0..da3d8f8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -148,6 +148,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64 + build-args: "GOLANG_VERSION=1.12.10" - name: Build and push Docker images for Contributors uses: docker/build-push-action@v2.4.0 if: github.repository_owner != 'kubesphere' @@ -158,6 +159,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} labels: ${{ steps.metaContributors.outputs.labels }} platforms: linux/amd64,linux/arm64 + build-args: "GOLANG_VERSION=1.12.10" BuildGo16: needs: BuildBase @@ -290,6 +292,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64 + build-args: "JDK_VERSION=1.8.0" - name: Build and push Docker images for Contributors uses: docker/build-push-action@v2.4.0 if: github.repository_owner != 'kubesphere' @@ -300,6 +303,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} labels: ${{ steps.metaContributors.outputs.labels }} platforms: linux/amd64,linux/arm64 + build-args: "JDK_VERSION=1.8.0" BuildMavenJDK11: needs: BuildBase diff --git a/base/Dockerfile b/base/Dockerfile index 9b16a0a..ecc5d48 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,7 +1,7 @@ FROM centos:7 # utils -RUN yum install -y epel-release && \ +RUN yum install -y epel-release ca-certificates && \ yum install -y unzip \ which \ make \ diff --git a/base/podman/Dockerfile b/base/podman/Dockerfile index 89a1cc8..a78044c 100644 --- a/base/podman/Dockerfile +++ b/base/podman/Dockerfile @@ -1,7 +1,7 @@ FROM centos:7 # utils -RUN yum install -y epel-release && \ +RUN yum install -y epel-release ca-certificates && \ yum install -y unzip \ which \ make \ diff --git a/dotnet/Dockerfile b/dotnet/Dockerfile index d7f6368..4939b3c 100644 --- a/dotnet/Dockerfile +++ b/dotnet/Dockerfile @@ -2,7 +2,7 @@ FROM kubespheredev/builder-base:v3.1.0 RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm -RUN yum install -y dotnet-sdk-5.0 dotnet-sdk-3.1 +RUN yum update -y && yum install -y dotnet-sdk-5.0 dotnet-sdk-3.1 RUN dotnet tool install --global dotnet-sonarscanner