From b6ca41f8332b35afa18e3913b9ea7ff94955b522 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Sun, 6 Jul 2014 14:09:18 +0200 Subject: [PATCH 1/2] clean up Docker documentation, add sudo to the the commandlines --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3999abfa..52d100d7 100644 --- a/README.md +++ b/README.md @@ -28,17 +28,17 @@ Please follow the instructions for your platform: - [Mac OS X](https://github.com/miguelfreitas/twister-core/blob/master/doc/build-osx.md) - [Windows (untested)](https://github.com/miguelfreitas/twister-core/wiki/Compiling-for-Windows) -Or, alternatively, you can run Twister on an isolated Linux container, using [docker](http://docker.io/). Quickstart: +> According to our tests, at least 1GB of RAM is needed to compile Twister. - # Prepend "sudo -E" if you are not logged in as root - ./twister-on-docker run --remote +Alternatively, you can run Twister on an isolated Linux container, using [Docker](http://docker.io/). First, [install Docker on your system](https://docs.docker.com/installation/#installation). Then run: -The above command downloads and runs a [pre-built image](https://registry.hub.docker.com/u/miguelfreitas/twister) from the Docker index. You can also build and run your own container: + # Leave out the "sudo -E" if you added yourself to the "docker" group + sudo -E ./twister-on-docker run --remote - ./twister-on-docker build - ./twister-on-docker run +The above command downloads and runs a [pre-built image](https://registry.hub.docker.com/u/miguelfreitas/twister) from the Docker index. You can also build and run your own container: -> According to our tests, at least 1GB of RAM is needed to compile Twister. + sudo -E ./twister-on-docker build + sudo -E ./twister-on-docker run ## License From 99cb2fa99bba81d8cac3f40776aa4290dc9a13f2 Mon Sep 17 00:00:00 2001 From: Martin Honermeyer Date: Sun, 6 Jul 2014 14:28:18 +0200 Subject: [PATCH 2/2] Fix twister-on-docker script for bash compatibility --- twister-on-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twister-on-docker b/twister-on-docker index d56dd377..c5b35e0f 100755 --- a/twister-on-docker +++ b/twister-on-docker @@ -21,7 +21,7 @@ build) ;; run) - if [ $MODE == "--remote" ]; then + if [ "$MODE" = "--remote" ]; then shift IMAGE_NAME=$REMOTE_IMAGE_NAME echo Pulling new version of $IMAGE_NAME