Fix Ranger Tagging in image publish process
Improper variables used for tagging process. This patchset will fix those variables. Change-Id: Iea20a757b39a85c06e02cea027d77bdac0cab709
This commit is contained in:
parent
81ff00435a
commit
5b9bf35b14
5
Makefile
5
Makefile
@ -18,7 +18,7 @@ IMAGE_PREFIX ?= attcomdev
|
|||||||
IMAGE_TAG ?= latest
|
IMAGE_TAG ?= latest
|
||||||
HELM ?= helm
|
HELM ?= helm
|
||||||
LABEL ?= miscellaneous
|
LABEL ?= miscellaneous
|
||||||
COMMIT ?= $(shell git rev-parse HEAD)
|
COMMIT := $(shell git rev-parse HEAD)
|
||||||
PROXY ?= http://foo.proxy.com:8000
|
PROXY ?= http://foo.proxy.com:8000
|
||||||
PUSH_IMAGE ?= false
|
PUSH_IMAGE ?= false
|
||||||
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
|
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
|
||||||
@ -30,9 +30,9 @@ IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${COMMIT}
|
|||||||
IMAGE_DIR:=images/$(IMAGE_NAME)
|
IMAGE_DIR:=images/$(IMAGE_NAME)
|
||||||
|
|
||||||
# Build ranger Docker image for this project
|
# Build ranger Docker image for this project
|
||||||
|
#make images will build and run ranger and rangercli
|
||||||
.PHONY: images
|
.PHONY: images
|
||||||
images: $(IMAGE_NAME)
|
images: $(IMAGE_NAME)
|
||||||
#make images will build and run ranger and rangercli
|
|
||||||
$(IMAGE_NAME):
|
$(IMAGE_NAME):
|
||||||
@echo
|
@echo
|
||||||
@echo "===== Processing [$@] image ====="
|
@echo "===== Processing [$@] image ====="
|
||||||
@ -73,7 +73,6 @@ endif
|
|||||||
|
|
||||||
ifeq ($(PUSH_IMAGE), true)
|
ifeq ($(PUSH_IMAGE), true)
|
||||||
docker push $(IMAGE)
|
docker push $(IMAGE)
|
||||||
docker push $(IMAGE_LATEST)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: build_rangercli
|
.PHONY: build_rangercli
|
||||||
|
Loading…
x
Reference in New Issue
Block a user