IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-05 19:07:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

dx: remove reliance on tar and symlink resolution in docker build (#121151)

Browse Source
This commit is contained in:
Charandas
2026-03-26 10:28:01 -07:00
committed by GitHub
parent 077d2142bb
commit 62d59eaae3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.dockerignore
+3
View File
@@ -24,3 +24,6 @@ node_modules
!.yarn/plugins
!.yarn/versions
!.yarn/cache
devenv
.nx
scripts/grafana-server/tmp
Makefile
+6 -6
View File
@@ -494,8 +494,7 @@ endif
.PHONY: build-docker-full
build-docker-full: ## Build Docker image for development.
@echo "build docker container mode=($(DOCKER_JS_NODE_ENV_FLAG))"
tar -ch . | \
docker buildx build - \
docker buildx build \
--platform $(PLATFORM) \
--build-arg NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
--build-arg JS_NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
@@ -506,13 +505,13 @@ build-docker-full: ## Build Docker image for development.
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
--tag grafana/grafana$(TAG_SUFFIX):dev \
$(DOCKER_BUILD_ARGS)
$(DOCKER_BUILD_ARGS) \
.
.PHONY: build-docker-full-ubuntu
build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
@echo "build docker container mode=($(DOCKER_JS_NODE_ENV_FLAG))"
tar -ch . | \
docker buildx build - \
docker buildx build \
--platform $(PLATFORM) \
--build-arg NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
--build-arg JS_NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
@@ -525,7 +524,8 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
--build-arg BASE_IMAGE=ubuntu:24.04 \
--build-arg GO_IMAGE=golang:$(GO_VERSION) \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS)
$(DOCKER_BUILD_ARGS) \
.
##@ Services