Skip to content

Commit

Permalink
Merge pull request #5 from rosskirkpat/bump-version
Browse files Browse the repository at this point in the history
bump hardened-build-base to v1.16.4b7 to align with other rke2 builds
  • Loading branch information
briandowns authored Aug 2, 2021
2 parents 7a9a2fc + 8cd98ef commit aaffbe7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 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.4b7
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.4b7
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.4b7
commands:
- make DRONE_TAG=${DRONE_TAG} image-scan
volumes:
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
## Build

```sh
TAG=v0.3.6 make
```
TAG=v0.3.7 make
```

0 comments on commit aaffbe7

Please sign in to comment.