Merge pull request #78 from butomo1989/master

Cleaned up

README.md

@@ -62,7 +62,7 @@ bash <(curl -s https://raw.githubusercontent.com/zalando-incubator/docker-locust
 It is also possible to run with normal docker command:
 
 ```bash
-docker run -i --rm -v $PWD/reports:/opt/reports -v ~/.aws:/root/.aws -v $PWD/:/opt/script -p 8089:8089 -e ROLE=standalone -e TARGET_HOST=https://targeturl.com -e LOCUST_FILE=https://raw.githubusercontent.com/zalando-incubator/docker-locust/master/example/simple.py -e SLAVE_MUL=4 -e AUTOMATIC=False registry.opensource.zalan.do/tip/docker-locust
+docker run -i --rm -v $PWD/reports:/opt/reports -v ~/.aws:/root/.aws -v $PWD/:/opt/script -v $PWD/credentials:/meta/credentials -p 8089:8089 -e ROLE=standalone -e TARGET_HOST=https://targeturl.com -e LOCUST_FILE=https://raw.githubusercontent.com/zalando-incubator/docker-locust/master/example/simple.py -e SLAVE_MUL=4 -e AUTOMATIC=False registry.opensource.zalan.do/tip/docker-locust
 ```
 
 ### Multiple machines

docker-compose.yaml

@@ -20,12 +20,16 @@ services:
     volumes:
       - ~/.aws:/root/.aws
       - ./:/opt/script
+      - ./credentials:/meta/credentials
     environment:
       - ROLE=slave
       - MASTER_HOST=master
       - TARGET_HOST=$TARGET_HOST
       - LOCUST_FILE=$LOCUST_FILE
       - SLAVE_MUL=$SLAVE_NUM
+      - OAUTH=$OAUTH
+      - URL=$URL
+      - SCOPES=$SCOPES
   controller:
     image: $IMAGE
     container_name: docker_locusts_controller

example/simple_post.py

@@ -33,3 +33,5 @@ def post_random_payload(self):
 
 class MyLocust(HttpLocust):
     task_set = SimplePostBehavior
+    min_wait = 0
+    max_wait = 0

local.sh

@@ -174,10 +174,10 @@ EOF
         fi
     else
         echo "Run in standalone mode"
-        docker run -i --rm -v $PWD/reports:/opt/reports -v ~/.aws:/root/.aws -v $PWD/:/opt/script -p 8089:8089 \
-        -e ROLE=standalone -e TARGET_HOST=$TARGET -e LOCUST_FILE=$LOCUST_FILE -e SLAVE_MUL=$SLAVES \
-        -e AUTOMATIC=$AUTOMATIC -e USERS=$USERS -e HATCH_RATE=$HATCH_RATE -e DURATION=$DURATION \
-        -e OAUTH=$OAUTH -e URL=$URL -e SCOPES=$SCOPES $IMAGE
+        docker run -i --rm -v $PWD/reports:/opt/reports -v ~/.aws:/root/.aws -v $PWD/:/opt/script \
+        -v $PWD/credentials:/meta/credentials -p 8089:8089 -e ROLE=standalone -e TARGET_HOST=$TARGET \
+        -e LOCUST_FILE=$LOCUST_FILE -e SLAVE_MUL=$SLAVES -e AUTOMATIC=$AUTOMATIC -e USERS=$USERS \
+        -e HATCH_RATE=$HATCH_RATE -e DURATION=$DURATION -e OAUTH=$OAUTH -e URL=$URL -e SCOPES=$SCOPES $IMAGE
     fi
 }