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 whereabouts v0.6.2 #14

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Update whereabouts v0.6.2 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ platform:
steps:
- name: build
pull: always
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.6b2
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.6b2
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push
Expand All @@ -35,7 +35,7 @@ steps:
- tag

- name: scan
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.6b2
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand All @@ -59,15 +59,15 @@ platform:
steps:
- name: build
pull: always
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.6b2
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.6b2
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push
Expand All @@ -84,7 +84,7 @@ steps:
- tag

- name: scan
image: rancher/hardened-build-base:v1.20.4b11
image: rancher/hardened-build-base:v1.20.6b2
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand Down Expand Up @@ -119,4 +119,4 @@ steps:
depends_on:
- linux-amd64
- linux-arm64
...
...
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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.6b2
FROM ${BCI_IMAGE} as bci

FROM ${GO_IMAGE} as builder
ARG ARCH="amd64"
ARG TAG="v0.6.1"
ARG TAG="v0.6.2"
ARG PKG="github.com/k8snetworkplumbingwg/whereabouts"
ARG SRC="github.com/k8snetworkplumbingwg/whereabouts"
RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BUILD_META=-build$(shell date +%Y%m%d)
ORG ?= rancher
PKG ?= github.com/k8snetworkplumbingwg/whereabouts
SRC ?= github.com/k8snetworkplumbingwg/whereabouts
TAG ?= v0.6.1$(BUILD_META)
TAG ?= v0.6.2$(BUILD_META)

ifneq ($(DRONE_TAG),)
TAG := $(DRONE_TAG)
Expand Down Expand Up @@ -50,4 +50,4 @@ image-manifest:

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean that image-scan was not working?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, the update to the newer go tag was causing CI to fail because the updated trivy image requires a scanning command