|
|
|
@ -86,7 +86,8 @@ endif |
|
|
|
PREFIX ?= $(shell pwd)
|
|
|
|
PREFIX ?= $(shell pwd)
|
|
|
|
BIN_DIR ?= $(shell pwd)
|
|
|
|
BIN_DIR ?= $(shell pwd)
|
|
|
|
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
|
|
|
|
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
|
|
|
|
DOCKERFILE_PATH ?= ./
|
|
|
|
DOCKERFILE_PATH ?= ./Dockerfile
|
|
|
|
|
|
|
|
DOCKERBUILD_CONTEXT ?= ./
|
|
|
|
DOCKER_REPO ?= prom
|
|
|
|
DOCKER_REPO ?= prom
|
|
|
|
|
|
|
|
|
|
|
|
DOCKER_ARCHS ?= amd64
|
|
|
|
DOCKER_ARCHS ?= amd64
|
|
|
|
@ -211,9 +212,10 @@ common-tarball: promu |
|
|
|
common-docker: $(BUILD_DOCKER_ARCHS) |
|
|
|
common-docker: $(BUILD_DOCKER_ARCHS) |
|
|
|
$(BUILD_DOCKER_ARCHS): common-docker-%: |
|
|
|
$(BUILD_DOCKER_ARCHS): common-docker-%: |
|
|
|
docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \
|
|
|
|
docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \
|
|
|
|
|
|
|
|
-f $(DOCKERFILE_PATH) \
|
|
|
|
--build-arg ARCH="$*" \
|
|
|
|
--build-arg ARCH="$*" \
|
|
|
|
--build-arg OS="linux" \
|
|
|
|
--build-arg OS="linux" \
|
|
|
|
$(DOCKERFILE_PATH)
|
|
|
|
$(DOCKERBUILD_CONTEXT)
|
|
|
|
|
|
|
|
|
|
|
|
.PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS) |
|
|
|
.PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS) |
|
|
|
common-docker-publish: $(PUBLISH_DOCKER_ARCHS) |
|
|
|
common-docker-publish: $(PUBLISH_DOCKER_ARCHS) |
|
|
|
|