Skip to content

Commit fb8a4f5

Browse files
committed
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 <[email protected]>
1 parent 095dae1 commit fb8a4f5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ docker-all: docker-build-image docker-run-build $(DOCKER_IMAGE)
265265
.PHONY: docker-shell
266266
docker-shell: ## Builds a docker image with the android build env and opens a shell
267267
docker build -f docker/DockerFile.amd64-shell -t tailscale-android-shell-amd64 .
268-
docker run -v --rm $(CURDIR):/build/tailscale-android -it tailscale-android-shell-amd64
268+
docker run --rm -v $(CURDIR):/build/tailscale-android -it tailscale-android-shell-amd64
269269

270270
.PHONY: docker-remove-shell-image
271271
docker-remove-shell-image: ## Removes all docker shell image

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ and XML files in Android Studio. Enable "Format on Save".
6363
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:
6464

6565
```sh
66-
make dockershell
66+
make docker-shell
6767
```
6868

6969
Several other makefile recipes are available for setting up the proper build environment and running builds.
7070

71-
Note that the docker makefile recipes s will preserve the image and remove container on completion.
72-
If changes are made to the build environment or toolchain, cached docker images may need to be rebuilt.
71+
Note that the docker makefile recipes s will preserve the image and remove container on completion.
72+
If changes are made to the build environment or toolchain, cached docker images may need to be rebuilt.
7373
The docker build image name is parameterized in the makefile and changing it provides a simple means to do this.
7474

7575
### Nix

0 commit comments

Comments
 (0)