Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build image to v1.20.7b3 #47

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Update build image to v1.20.7b3 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1dae0d
update build image to v1.20.7b3
johnatasr Aug 25, 2023
5edd059
update trivy image scan command
johnatasr Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ platform:
steps:
- name: build
pull: always
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- make DRONE_TAG=${DRONE_TAG}
volumes:
Expand All @@ -24,7 +24,7 @@ steps:
- refs/pull/**

- name: publish
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push
Expand All @@ -41,7 +41,7 @@ steps:
- tag

- name: scan
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand All @@ -64,15 +64,15 @@ platform:
steps:
- name: build
pull: always
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- make DRONE_TAG=${DRONE_TAG}
volumes:
- name: docker
path: /var/run/docker.sock

- name: publish
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push
Expand All @@ -89,7 +89,7 @@ steps:
- tag

- name: scan
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand Down Expand Up @@ -121,7 +121,7 @@ node:
steps:
- name: build
pull: always
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- make DRONE_TAG=${DRONE_TAG}
volumes:
Expand All @@ -135,7 +135,7 @@ steps:
- refs/pull/**

- name: publish
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.7b3
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG ARCH="amd64"
ARG TAG="v3.26.1"
ARG BCI_IMAGE=registry.suse.com/bci/bci-base
ARG GO_IMAGE=rancher/hardened-build-base:v1.20.7b2
ARG GO_IMAGE=rancher/hardened-build-base:v1.20.7b3
ARG CNI_IMAGE=rancher/hardened-cni-plugins:v1.2.0-build20230523
ARG GOEXPERIMENT=boringcrypto

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ image-manifest:

.PHONY: image-scan
image-scan:
trivy --severity $(SEVERITIES) --no-progress --ignore-unfixed $(ORG)/hardened-calico:$(TAG)
trivy image --severity $(SEVERITIES) --no-progress --ignore-unfixed $(ORG)/hardened-calico:$(TAG)