From fb8a4f51dc720bdefa181e6de2f4848a9fedd827 Mon Sep 17 00:00:00 2001 From: Anton Tolchanov Date: Tue, 3 Sep 2024 16:18:17 +0100 Subject: [PATCH] Makefile: fix docker-shell command line - Fix volume mounting (positional argument to `-v`) - Correct the make target name in README Updates tailscale/corp#19670 Signed-off-by: Anton Tolchanov --- Makefile | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4e104fb..7c835ee 100644 --- a/Makefile +++ b/Makefile @@ -265,7 +265,7 @@ docker-all: docker-build-image docker-run-build $(DOCKER_IMAGE) .PHONY: docker-shell docker-shell: ## Builds a docker image with the android build env and opens a shell docker build -f docker/DockerFile.amd64-shell -t tailscale-android-shell-amd64 . - docker run -v --rm $(CURDIR):/build/tailscale-android -it tailscale-android-shell-amd64 + docker run --rm -v $(CURDIR):/build/tailscale-android -it tailscale-android-shell-amd64 .PHONY: docker-remove-shell-image docker-remove-shell-image: ## Removes all docker shell image diff --git a/README.md b/README.md index ca3fd2b..e072061 100644 --- a/README.md +++ b/README.md @@ -63,13 +63,13 @@ and XML files in Android Studio. Enable "Format on Save". If you wish to avoid installing software on your host system, a Docker based development strategy is available, you can build and start a shell with: ```sh -make dockershell +make docker-shell ``` Several other makefile recipes are available for setting up the proper build environment and running builds. -Note that the docker makefile recipes s will preserve the image and remove container on completion. -If changes are made to the build environment or toolchain, cached docker images may need to be rebuilt. +Note that the docker makefile recipes s will preserve the image and remove container on completion. +If changes are made to the build environment or toolchain, cached docker images may need to be rebuilt. The docker build image name is parameterized in the makefile and changing it provides a simple means to do this. ### Nix