diff --git a/.drone.yml b/.drone.yml index 8f7900b..3e9a7a8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ 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: @@ -18,7 +18,7 @@ steps: 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 @@ -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: diff --git a/0001-fix-modebuild.patch b/0001-fix-modebuild.patch deleted file mode 100644 index 18e3cee..0000000 --- a/0001-fix-modebuild.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2fc539d16603bcaff9f735741c32e04d736d122b Mon Sep 17 00:00:00 2001 -From: Manuel Buil -Date: Wed, 17 Feb 2021 13:17:09 +0100 -Subject: [PATCH] fix modebuild - ---- - scripts/build.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/build.sh b/scripts/build.sh -index c5ec53f..fd1d564 100755 ---- a/scripts/build.sh -+++ b/scripts/build.sh -@@ -29,5 +29,5 @@ export GOBIN=${PWD}/bin - export CGO_ENABLED=0 - export GO15VENDOREXPERIMENT=1 - --go install -ldflags "-s -w" -buildmode=pie -tags no_openssl "$@" ${REPO_PATH}/cmd/installer --go install -ldflags "-s -w" -buildmode=pie -tags no_openssl "$@" ${REPO_PATH}/cmd/webhook -+go install -ldflags "-s -w" -tags no_openssl "$@" ${REPO_PATH}/cmd/installer -+go install -ldflags "-s -w" -tags no_openssl "$@" ${REPO_PATH}/cmd/webhook --- -2.26.2 - diff --git a/Dockerfile b/Dockerfile index b56ebb0..a3c18d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 diff --git a/Makefile b/Makefile index 462c828..9aa6eb9 100644 --- a/Makefile +++ b/Makefile @@ -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)