mirror of https://github.com/k3s-io/k3s
[Release-1.28] Auto Dependancy Bump (#9419)
* Bump Trivy version (#9237) * chore: Bump Trivy version Made with ❤️️ by updatecli * chore: Bump Trivy version Made with ❤️️ by updatecli --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * build: Align drone base images (#8959) Align the base images used in drone with the images used across the ecosystem. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com> --------- Signed-off-by: Derek Nola <derek.nola@suse.com> Signed-off-by: Paulo Gomes <paulo.gomes@suse.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Paulo Gomes <paulo.gomes@suse.com>pull/9404/head
Derek Nola
GitHub
parent
190864259e
commit
5eb278b838
32
.drone.yml
32
.drone.yml
|
|
@ -31,7 +31,7 @@ steps:
|
|||
- pull_request
|
||||
|
||||
- name: build
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader, unprivileged_github_token ]
|
||||
environment:
|
||||
GITHUB_TOKEN:
|
||||
|
|
@ -48,7 +48,7 @@ steps:
|
|||
path: /var/run/docker.sock
|
||||
|
||||
- name: validate-cross-compilation
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
commands:
|
||||
- dapper validate-cross-compilation
|
||||
volumes:
|
||||
|
|
@ -73,7 +73,7 @@ steps:
|
|||
- tag
|
||||
|
||||
- name: github_binary_release
|
||||
image: ibuildthecloud/github-release:v0.0.1
|
||||
image: plugins/github-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: github_token
|
||||
|
|
@ -114,7 +114,7 @@ steps:
|
|||
- tag
|
||||
|
||||
- name: test
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
|
||||
environment:
|
||||
ENABLE_REGISTRY: 'true'
|
||||
|
|
@ -132,7 +132,7 @@ steps:
|
|||
path: /var/run/docker.sock
|
||||
|
||||
- name: github_e2e_logs_release
|
||||
image: ibuildthecloud/github-release:v0.0.1
|
||||
image: plugins/github-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: github_token
|
||||
|
|
@ -169,7 +169,7 @@ trigger:
|
|||
|
||||
steps:
|
||||
- name: build
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
commands:
|
||||
- dapper ci
|
||||
- echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
|
||||
|
|
@ -178,7 +178,7 @@ steps:
|
|||
path: /var/run/docker.sock
|
||||
|
||||
- name: test
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
environment:
|
||||
ENABLE_REGISTRY: 'true'
|
||||
commands:
|
||||
|
|
@ -228,7 +228,7 @@ steps:
|
|||
- pull_request
|
||||
|
||||
- name: build
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
|
||||
environment:
|
||||
AWS_SECRET_ACCESS_KEY:
|
||||
|
|
@ -243,7 +243,7 @@ steps:
|
|||
path: /var/run/docker.sock
|
||||
|
||||
- name: github_binary_release
|
||||
image: ibuildthecloud/github-release:v0.0.1
|
||||
image: plugins/github-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: github_token
|
||||
|
|
@ -284,7 +284,7 @@ steps:
|
|||
- tag
|
||||
|
||||
- name: test
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
|
||||
environment:
|
||||
ENABLE_REGISTRY: 'true'
|
||||
|
|
@ -339,6 +339,11 @@ steps:
|
|||
- pull_request
|
||||
|
||||
- name: build
|
||||
# Keeping Dapper at v0.5.0 for armv7, as newer versions fails with
|
||||
# Bad system call on this architecture. xref:
|
||||
#
|
||||
# https://github.com/k3s-io/k3s/pull/8959#discussion_r1439736566
|
||||
# https://drone-pr.k3s.io/k3s-io/k3s/7922/3/3
|
||||
image: rancher/dapper:v0.5.0
|
||||
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
|
||||
environment:
|
||||
|
|
@ -354,7 +359,7 @@ steps:
|
|||
path: /var/run/docker.sock
|
||||
|
||||
- name: github_binary_release
|
||||
image: ibuildthecloud/github-release:v0.0.1
|
||||
image: plugins/github-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: github_token
|
||||
|
|
@ -395,6 +400,7 @@ steps:
|
|||
- tag
|
||||
|
||||
- name: test
|
||||
# Refer to comment for arm/build.
|
||||
image: rancher/dapper:v0.5.0
|
||||
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
|
||||
environment:
|
||||
|
|
@ -448,7 +454,7 @@ steps:
|
|||
- pull_request
|
||||
|
||||
- name: validate_go_mods
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
commands:
|
||||
- docker build --target test-mods -t k3s:mod -f Dockerfile.test .
|
||||
- docker run -i k3s:mod
|
||||
|
|
@ -604,7 +610,7 @@ steps:
|
|||
- pull_request
|
||||
|
||||
- name: build-e2e-image
|
||||
image: rancher/dapper:v0.5.0
|
||||
image: rancher/dapper:v0.6.0
|
||||
commands:
|
||||
- DOCKER_BUILDKIT=1 docker build --target test-e2e -t test-e2e -f Dockerfile.test .
|
||||
- SKIP_VALIDATE=true SKIP_AIRGAP=true GOCOVER=1 dapper ci
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ RUN apk -U --no-cache add \
|
|||
RUN python3 -m pip install awscli
|
||||
|
||||
# Install Trivy
|
||||
ENV TRIVY_VERSION="0.46.1"
|
||||
ENV TRIVY_VERSION="0.49.0"
|
||||
RUN case "$(go env GOARCH)" in \
|
||||
arm64) TRIVY_ARCH="ARM64" ;; \
|
||||
amd64) TRIVY_ARCH="64bit" ;; \
|
||||
|
|
|
|||
Loading…
Reference in New Issue