From a830451426f0ac60d2e70ccc0014d2801d761a44 Mon Sep 17 00:00:00 2001
From: Johan Brandhorst <johan.brandhorst@gmail.com>
Date: Thu, 13 Dec 2018 09:39:03 +0000
Subject: [PATCH] Dockerfile, README, docs: Remove entrypoint

This was causing more trouble than it was helping,
so lets remove it.
---
 Dockerfile      |  3 +--
 README.md       |  2 +-
 docs/docker.rst | 14 +++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2dcf01f0..e192961e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,6 @@ RUN cd /go/src/github.com/aykevl/tinygo/ && \
     dep ensure --vendor-only && \
     go install /go/src/github.com/aykevl/tinygo/
 
-ENTRYPOINT ["/go/bin/tinygo"]
-
 # tinygo-wasm stage installs the needed dependencies to compile TinyGo programs for WASM.
 FROM tinygo-base AS tinygo-wasm
 
@@ -79,3 +77,4 @@ RUN cd /go/src/github.com/aykevl/tinygo/ && \
     apt-get autoremove -y && \
     apt-get clean
 
+CMD ["tinygo"]
diff --git a/README.md b/README.md
index 5f07816f..9e61136e 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ See the [installation instructions](https://tinygo.readthedocs.io/en/latest/inst
 A docker container exists for easy access to the `tinygo` CLI:
 
 ```sh
-$ docker run --rm -v $(pwd):/src tinygo/tinygo build -o /src/wasm.wasm -target wasm examples/wasm
+$ docker run --rm -v $(pwd):/src tinygo/tinygo tinygo build -o /src/wasm.wasm -target wasm examples/wasm
 ```
 
 Note that you cannot run `tinygo flash` from inside the docker container,
diff --git a/docs/docker.rst b/docs/docker.rst
index 94ff8e3d..315bd736 100644
--- a/docs/docker.rst
+++ b/docs/docker.rst
@@ -9,25 +9,25 @@ A docker container exists for easy access to the ``tinygo`` CLI. For example, to
 compile ``wasm.wasm`` for the WebAssembly example, from the root of the
 repository::
 
-    docker run --rm -v $(pwd):/src tinygo/tinygo build -o /src/wasm.wasm -target wasm examples/wasm
+    docker run --rm -v $(pwd):/src tinygo/tinygo tinygo build -o /src/wasm.wasm -target wasm examples/wasm
 
 To compile ``blinky1.hex`` targeting an ARM microcontroller, such as the PCA10040::
 
-    docker run --rm -v $(pwd):/src tinygo/tinygo build -o /src/blinky1.hex -size=short -target=pca10040 examples/blinky1
+    docker run --rm -v $(pwd):/src tinygo/tinygo tinygo build -o /src/blinky1.hex -size=short -target=pca10040 examples/blinky1
 
 To compile ``blinky1.hex`` targeting an AVR microcontroller such as the Arduino::
 
-    docker run --rm -v $(pwd):/src tinygo/tinygo build -o /src/blinky1.hex -size=short -target=arduino examples/blinky1
+    docker run --rm -v $(pwd):/src tinygo/tinygo tinygo build -o /src/blinky1.hex -size=short -target=arduino examples/blinky1
 
 For projects that have remote dependencies outside of the standard library and go code within your own project, you will need to map your entire GOPATH into the docker image in order for those dependencies to be found::
 
-    docker run  -v $(PWD):/mysrc -v $GOPATH:/gohost -e "GOPATH=$GOPATH:/gohost" tinygo/tinygo build -o /mysrc/wasmout.wasm -target wasm /mysrc/wasm-main.go
+    docker run  -v $(PWD):/mysrc -v $GOPATH:/gohost -e "GOPATH=$GOPATH:/gohost" tinygo/tinygo tinygo build -o /mysrc/wasmout.wasm -target wasm /mysrc/wasm-main.go
 
 .. note::
-  At this time, tinygo does not resolve dependencies from the /vendor/ folder within your project. 
+  At this time, tinygo does not resolve dependencies from the /vendor/ folder within your project.
 
-For microcontroller development you must flash your hardware devices 
-from your host environment, since you cannot run ``tinygo flash`` from inside 
+For microcontroller development you must flash your hardware devices
+from your host environment, since you cannot run ``tinygo flash`` from inside
 the docker container.
 
 So your workflow could be: