Merge "Minor fix: duplicate items in .title label of container images"
This commit is contained in:
commit
5cf8548942
4
Makefile
4
Makefile
|
@ -44,7 +44,7 @@ images: $(IMAGE_NAME)
|
||||||
$(IMAGE_NAME):
|
$(IMAGE_NAME):
|
||||||
@echo
|
@echo
|
||||||
@echo "===== Processing [$@] image ====="
|
@echo "===== Processing [$@] image ====="
|
||||||
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@
|
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@
|
||||||
@make run IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} SCRIPT=./tools/$@_image_run.sh
|
@make run IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} SCRIPT=./tools/$@_image_run.sh
|
||||||
|
|
||||||
# Build all docker images for this project
|
# Build all docker images for this project
|
||||||
|
@ -169,4 +169,4 @@ docs: clean build_docs
|
||||||
|
|
||||||
.PHONY: build_docs
|
.PHONY: build_docs
|
||||||
build_docs:
|
build_docs:
|
||||||
tox -e docs
|
tox -e docs
|
||||||
|
|
Loading…
Reference in New Issue