diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 02f032e..28e2104 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -107,10 +107,13 @@ jobs: --value-set tag=kubespheredev/ks-jenkins:${{ steps.build_env.outputs.version }} \ --value-set platform=linux/amd64 - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.2.0 + uses: aquasecurity/trivy-action@master + env: + TRIVY_OFFLINE_SCAN: true if: github.event_name == 'pull_request' with: image-ref: 'kubespheredev/ks-jenkins:${{ steps.build_env.outputs.version }}' + timeout: 10m format: 'table' exit-code: '1' ignore-unfixed: true diff --git a/Makefile b/Makefile index 57632da..125cc89 100644 --- a/Makefile +++ b/Makefile @@ -9,4 +9,4 @@ build-arm: run: jcli config gen -i=false > /home/gitpod/.jenkins-cli.yaml - jcli center start --image kubesphere/ks-jenkins --version v3.3.0-2.319.1 --setup-wizard=false + jcli center start --image kubesphere/ks-jenkins --version v3.4.0-2.319.1 --setup-wizard=false diff --git a/README.md b/README.md index ef92c3e..67e9350 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The docker images are below: | | | |---|---| -| official | `kubesphere/ks-jenkins:v3.3.0-2.319.1` | +| official | `kubesphere/ks-jenkins:v3.4.0-2.319.1` | | experimental | `kubespheredev/ks-jenkins:master` | ## Build from source diff --git a/formula.yaml b/formula.yaml index c3f2462..6662e44 100644 --- a/formula.yaml +++ b/formula.yaml @@ -428,7 +428,7 @@ plugins: - groupId: org.jenkins-ci.plugins artifactId: scm-api source: - version: 2.6.4 + version: 608.vfa_f971c5a_a_e9 - groupId: org.jenkins-ci.ui artifactId: momentjs source: @@ -504,7 +504,7 @@ plugins: - groupId: org.jenkins-ci.plugins artifactId: ssh-credentials source: - version: 1.18.1 + version: 277.v95c2fec1c047 - groupId: org.jenkins-ci.plugins artifactId: structs source: @@ -512,7 +512,7 @@ plugins: - groupId: org.jenkins-ci.plugins artifactId: subversion source: - version: 2.13.2 + version: 2.16.0 - groupId: org.jenkins-ci.plugins artifactId: support-core source: