Skip to content

Commit

Permalink
Merge pull request #5 from manuelbuil/update_version_base_image
Browse files Browse the repository at this point in the history
Update sriov-network-resources-injector and base image version
  • Loading branch information
manuelbuil authored Oct 6, 2021
2 parents f208ee5 + b57ff9d commit cabb27a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .drone.yml
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.15.8b5
image: rancher/hardened-build-base:v1.16.7b7
commands:
- make DRONE_TAG=${DRONE_TAG}
volumes:
- name: docker
path: /var/run/docker.sock

- name: publish
image: rancher/hardened-build-base:v1.15.8b5
image: rancher/hardened-build-base:v1.16.7b7
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- make DRONE_TAG=${DRONE_TAG} image-push image-manifest
Expand All @@ -35,7 +35,7 @@ steps:
- tag

- name: scan
image: rancher/hardened-build-base:v1.15.8b5
image: rancher/hardened-build-base:v1.16.7b7
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand Down
24 changes: 0 additions & 24 deletions 0001-fix-modebuild.patch

This file was deleted.

6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG TAG="v1"
ARG TAG="v1.2"
ARG UBI_IMAGE=registry.access.redhat.com/ubi7/ubi-minimal:latest
ARG GO_IMAGE=rancher/hardened-build-base:v1.15.8b5
ARG GO_IMAGE=rancher/hardened-build-base:v1.16.7b7

# Build the project
FROM ${GO_IMAGE} as builder
Expand All @@ -11,8 +11,6 @@ RUN git clone --depth=1 https://github.com/k8snetworkplumbingwg/network-resource
WORKDIR network-resources-injector
RUN git fetch --all --tags --prune
RUN git checkout tags/${TAG} -b ${TAG}
COPY 0001-fix-modebuild.patch .
RUN patch -p1 < 0001-fix-modebuild.patch
RUN make

# Create the network resources injector image
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ endif

BUILD_META=-build$(shell date +%Y%m%d)
ORG ?= rancher
TAG ?= v1$(BUILD_META)
TAG ?= v1.2$(BUILD_META)

ifneq ($(DRONE_TAG),)
TAG := $(DRONE_TAG)
Expand Down

0 comments on commit cabb27a

Please sign in to comment.