diff --git a/.drone.yml b/.drone.yml index 8f7900b..68729d7 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.4b7 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.4b7 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.4b7 commands: - make DRONE_TAG=${DRONE_TAG} image-scan volumes: diff --git a/Dockerfile b/Dockerfile index 43e330b..4da3718 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ 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.4b7 FROM ${UBI_IMAGE} as ubi FROM ${GO_IMAGE} as builder # setup required packages @@ -14,18 +14,20 @@ RUN set -x \ # setup the build ARG PKG="github.com/kubernetes-incubator/metrics-server" ARG SRC="github.com/kubernetes-sigs/metrics-server" -ARG TAG="v0.3.6" +ARG TAG="v0.3.7" RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG} WORKDIR $GOPATH/src/${PKG} RUN git fetch --all --tags --prune RUN git checkout tags/${TAG} -b ${TAG} -RUN go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr \ +RUN GO111MODULE=off \ + go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr \ -i k8s.io/metrics/pkg/apis/metrics/v1beta1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version \ -p ${PKG}/pkg/generated/openapi/ \ -O zz_generated.openapi \ -h $(pwd)/hack/boilerplate.go.txt \ -r /dev/null -RUN GO_LDFLAGS="-linkmode=external \ +RUN GO111MODULE=off \ + GO_LDFLAGS="-linkmode=external \ -X ${PKG}/pkg/version.Version=${TAG} \ -X ${PKG}/pkg/version.gitCommit=$(git rev-parse HEAD) \ -X ${PKG}/pkg/version.gitTreeState=clean \ diff --git a/Makefile b/Makefile index 1b17885..30cd257 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ORG ?= rancher # but still refers internally to github.com/kubernetes-incubator/metrics-server packages PKG ?= github.com/kubernetes-incubator/metrics-server SRC ?= github.com/kubernetes-sigs/metrics-server -TAG ?= v0.3.6$(BUILD_META) +TAG ?= v0.3.7$(BUILD_META) ifneq ($(DRONE_TAG),) TAG := $(DRONE_TAG) diff --git a/README.md b/README.md index 07d0d90..5a8a06c 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,5 @@ ## Build ```sh -TAG=v0.3.6 make -``` \ No newline at end of file +TAG=v0.3.7 make +```