|
|
@ -222,7 +222,7 @@ build-docker-full: ## Build Docker image for development. |
|
|
|
--build-arg BINGO=false \
|
|
|
|
--build-arg BINGO=false \
|
|
|
|
--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
|
|
|
|
--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
|
|
|
|
--build-arg WIRE_TAGS=$(WIRE_TAGS) \
|
|
|
|
--build-arg WIRE_TAGS=$(WIRE_TAGS) \
|
|
|
|
--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
|
|
|
|
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
|
|
|
|
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
|
|
|
|
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
|
|
|
|
--tag grafana/grafana$(TAG_SUFFIX):dev \
|
|
|
|
--tag grafana/grafana$(TAG_SUFFIX):dev \
|
|
|
|
$(DOCKER_BUILD_ARGS)
|
|
|
|
$(DOCKER_BUILD_ARGS)
|
|
|
@ -235,7 +235,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. |
|
|
|
--build-arg BINGO=false \
|
|
|
|
--build-arg BINGO=false \
|
|
|
|
--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
|
|
|
|
--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
|
|
|
|
--build-arg WIRE_TAGS=$(WIRE_TAGS) \
|
|
|
|
--build-arg WIRE_TAGS=$(WIRE_TAGS) \
|
|
|
|
--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
|
|
|
|
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
|
|
|
|
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
|
|
|
|
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
|
|
|
|
--build-arg BASE_IMAGE=ubuntu:20.04 \
|
|
|
|
--build-arg BASE_IMAGE=ubuntu:20.04 \
|
|
|
|
--build-arg GO_IMAGE=golang:1.20.8 \
|
|
|
|
--build-arg GO_IMAGE=golang:1.20.8 \
|
|
|
|