mirror of
https://github.com/kubernetes-sigs/prometheus-adapter.git
synced 2026-04-06 01:38:10 +00:00
Merge pull request #408 from paulfantom/version-file
*: add version file
This commit is contained in:
commit
82a71ebb6f
3 changed files with 6 additions and 5 deletions
|
|
@ -3,7 +3,7 @@ set -x
|
||||||
docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
|
docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
|
||||||
|
|
||||||
if [[ -n $TRAVIS_TAG ]]; then
|
if [[ -n $TRAVIS_TAG ]]; then
|
||||||
make push VERSION=${TRAVIS_TAG}
|
make push TAG="$(cat "VERSION")"
|
||||||
else
|
else
|
||||||
make push-amd64
|
make push-amd64
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
8
Makefile
8
Makefile
|
|
@ -4,7 +4,7 @@ ARCH?=$(shell go env GOARCH)
|
||||||
ALL_ARCH=amd64 arm arm64 ppc64le s390x
|
ALL_ARCH=amd64 arm arm64 ppc64le s390x
|
||||||
ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x
|
ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x
|
||||||
|
|
||||||
VERSION?=latest
|
TAG?=latest
|
||||||
GOIMAGE=golang:1.16
|
GOIMAGE=golang:1.16
|
||||||
|
|
||||||
ifeq ($(ARCH),amd64)
|
ifeq ($(ARCH),amd64)
|
||||||
|
|
@ -35,16 +35,16 @@ prometheus-adapter: $(src_deps)
|
||||||
|
|
||||||
.PHONY: docker-build
|
.PHONY: docker-build
|
||||||
docker-build:
|
docker-build:
|
||||||
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(VERSION) --build-arg ARCH=$(ARCH) --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(GOIMAGE) .
|
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) --build-arg ARCH=$(ARCH) --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(GOIMAGE) .
|
||||||
|
|
||||||
.PHONY: push-%
|
.PHONY: push-%
|
||||||
push-%:
|
push-%:
|
||||||
$(MAKE) ARCH=$* docker-build
|
$(MAKE) ARCH=$* docker-build
|
||||||
docker push $(REGISTRY)/$(IMAGE)-$*:$(VERSION)
|
docker push $(REGISTRY)/$(IMAGE)-$*:$(TAG)
|
||||||
|
|
||||||
.PHONY: push
|
.PHONY: push
|
||||||
push: ./manifest-tool $(addprefix push-,$(ALL_ARCH))
|
push: ./manifest-tool $(addprefix push-,$(ALL_ARCH))
|
||||||
./manifest-tool push from-args --platforms $(ML_PLATFORMS) --template $(REGISTRY)/$(IMAGE)-ARCH:$(VERSION) --target $(REGISTRY)/$(IMAGE):$(VERSION)
|
./manifest-tool push from-args --platforms $(ML_PLATFORMS) --template $(REGISTRY)/$(IMAGE)-ARCH:$(TAG) --target $(REGISTRY)/$(IMAGE):$(TAG)
|
||||||
|
|
||||||
./manifest-tool:
|
./manifest-tool:
|
||||||
curl -sSL https://github.com/estesp/manifest-tool/releases/download/v0.5.0/manifest-tool-linux-amd64 > manifest-tool
|
curl -sSL https://github.com/estesp/manifest-tool/releases/download/v0.5.0/manifest-tool-linux-amd64 > manifest-tool
|
||||||
|
|
|
||||||
1
VERSION
Normal file
1
VERSION
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
0.8.4
|
||||||
Loading…
Add table
Add a link
Reference in a new issue