diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-26 19:38:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 19:38:49 +0000 |
| commit | f3024b906ce717f7858c138a9c1daf72bdb8d132 (patch) | |
| tree | 2c1adfa8ca6f622a88f03402dc7ff49524bf388d /vendor/github.com/prometheus/procfs/Makefile.common | |
| parent | c81e273835303664d62c4e958a7f34877c05ed49 (diff) | |
| parent | fc197fb4f5c0e0d90da39fe672bce7d145272415 (diff) | |
| download | podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.tar.gz podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.tar.bz2 podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.zip | |
Merge pull request #9821 from rhatdan/VENDOR
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Diffstat (limited to 'vendor/github.com/prometheus/procfs/Makefile.common')
| -rw-r--r-- | vendor/github.com/prometheus/procfs/Makefile.common | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/github.com/prometheus/procfs/Makefile.common b/vendor/github.com/prometheus/procfs/Makefile.common index 9320176ca..3ac29c636 100644 --- a/vendor/github.com/prometheus/procfs/Makefile.common +++ b/vendor/github.com/prometheus/procfs/Makefile.common @@ -78,7 +78,7 @@ ifneq ($(shell which gotestsum),) endif endif -PROMU_VERSION ?= 0.5.0 +PROMU_VERSION ?= 0.7.0 PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz GOLANGCI_LINT := @@ -245,10 +245,12 @@ common-docker-publish: $(PUBLISH_DOCKER_ARCHS) $(PUBLISH_DOCKER_ARCHS): common-docker-publish-%: docker push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" +DOCKER_MAJOR_VERSION_TAG = $(firstword $(subst ., ,$(shell cat VERSION))) .PHONY: common-docker-tag-latest $(TAG_DOCKER_ARCHS) common-docker-tag-latest: $(TAG_DOCKER_ARCHS) $(TAG_DOCKER_ARCHS): common-docker-tag-latest-%: docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:latest" + docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:v$(DOCKER_MAJOR_VERSION_TAG)" .PHONY: common-docker-manifest common-docker-manifest: |