0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40768 from cpuguy83/make_use_build_shell

Browse source 
Rename newer build_shell target to build
This commit is contained in:
Kir Kolyshkin 2020-04-09 11:55:50 -07:00 • committed by GitHub
commit 9bdf473a7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -187,15 +187,6 @@ autogen:
binary dynbinary cross: buildx autogen
$(BUILD_CMD) $(BUILD_OPTS) --output=bundles/ --target=$@ $(VERSION_AUTOGEN_ARGS) .
build: target = --target=final
ifdef USE_BUILDX
build: bundles buildx
$(BUILD_CMD) $(BUILD_OPTS) $(BUILD_CROSS) $(target) -t "$(DOCKER_IMAGE)" .
else
build: bundles ## This is a legacy target and you should probably use something else.
$(BUILD_CMD) $(BUILD_OPTS) -t "$(DOCKER_IMAGE)" $(BUILD_CROSS) $(target) .
endif
bundles:
mkdir bundles
@ -215,19 +206,19 @@ install: ## install the linux binaries
run: build ## run the docker daemon in a container
$(DOCKER_RUN_DOCKER) sh -c "KEEPBUNDLE=1 hack/make.sh install-binary run"
.PHONY: build_shell
.PHONY: build
ifeq ($(BIND_DIR), .)
build_shell: shell_target := --target=dev
build: shell_target := --target=dev
else
build_shell: shell_target := --target=final
build: shell_target := --target=final
endif
ifdef USE_BUILDX
build_shell: buildx_load := --load
build: buildx_load := --load
endif
build_shell: buildx
build: buildx
$(BUILD_CMD) $(BUILD_OPTS) $(shell_target) $(buildx_load) $(BUILD_CROSS) -t "$(DOCKER_IMAGE)" .
shell: build_shell ## start a shell inside the build env
shell: build ## start a shell inside the build env
$(DOCKER_RUN_DOCKER) bash
test: build test-unit ## run the unit, integration and docker-py tests