Skip to content

Commit

Permalink
Update build base to v1.20.7b3 (#37)
Browse files Browse the repository at this point in the history
* update build base to v1.20.7b3

Signed-off-by: Johnatas <[email protected]>

* update trivy image scan command

Signed-off-by: Johnatas <[email protected]>

---------

Signed-off-by: Johnatas <[email protected]>
  • Loading branch information
Johnatas authored Sep 4, 2023
1 parent dfbd4f7 commit e43ccbb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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 @@ -23,7 +23,7 @@ steps:
- refs/tags/*

- 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 @@ -40,7 +40,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 @@ -63,15 +63,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 @@ -88,7 +88,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 @@ -117,7 +117,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} OS=windows
volumes:
Expand All @@ -131,7 +131,7 @@ steps:
- refs/tags/*

- 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} OS=windows image-push
Expand Down Expand Up @@ -166,7 +166,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 @@ -180,7 +180,7 @@ steps:
- refs/tags/*

- 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BCI_IMAGE=registry.suse.com/bci/bci-base
ARG GO_IMAGE=rancher/hardened-build-base:v1.20.4b11
ARG GO_IMAGE=rancher/hardened-build-base:v1.20.7b3
FROM ${BCI_IMAGE} as bci
FROM ${GO_IMAGE} as builder
ARG ARCH="amd64"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BCI_IMAGE=registry.suse.com/bci/bci-base
ARG GO_IMAGE=rancher/hardened-build-base:v1.19.3b1
ARG GO_IMAGE=rancher/hardened-build-base:v1.20.7b3
FROM ${BCI_IMAGE} as bci
FROM ${GO_IMAGE} as builder
ARG ARCH="amd64"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ image-manifest:

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

0 comments on commit e43ccbb

Please sign in to comment.