diff --git a/docker-image/Dockerfile b/docker-image/Dockerfile index f0db361..e6ad070 100644 --- a/docker-image/Dockerfile +++ b/docker-image/Dockerfile @@ -14,7 +14,7 @@ # Start with a base Python 2.7.8 image -FROM python:2.7.8 +FROM python:2.7-alpine MAINTAINER Sandeep Parikh @@ -25,7 +25,11 @@ ADD licenses /licenses ADD locust-tasks /locust-tasks # Install the required dependencies via pip -RUN pip install -r /locust-tasks/requirements.txt +RUN apk --no-cache add --virtual=.build-dep \ + build-base \ + && apk --no-cache add bash libzmq \ + && pip install -r /locust-tasks/requirements.txt \ + && apk del .build-dep # Expose the required Locust ports EXPOSE 5557 5558 8089 diff --git a/docker-image/default.profraw b/docker-image/default.profraw new file mode 100644 index 0000000..03d566e Binary files /dev/null and b/docker-image/default.profraw differ diff --git a/docker-image/licenses/licenses.txt b/docker-image/licenses/licenses.txt index 631f04f..fcbf267 100644 --- a/docker-image/licenses/licenses.txt +++ b/docker-image/licenses/licenses.txt @@ -1,11 +1,11 @@ Flask (BSD, 0.10.1) https://github.com/mitsuhiko/flask/raw/master/LICENSE -gevent (MIT, 1.0.1) https://github.com/gevent/gevent/raw/master/LICENSE -greenlet (MIT, 0.4.5) https://github.com/python-greenlet/greenlet/raw/master/LICENSE +gevent (MIT, 1.2.2) https://github.com/gevent/gevent/raw/master/LICENSE +greenlet (MIT, 0.4.10) https://github.com/python-greenlet/greenlet/raw/master/LICENSE itsdangerous (BSD, 0.24) https://github.com/mitsuhiko/itsdangerous/raw/master/LICENSE Jinja2 (BSD, 2.7.3) https://github.com/mitsuhiko/jinja2/raw/master/LICENSE -locustio (MIT, 0.7.2) https://github.com/locustio/locust/raw/master/LICENSE +locustio (MIT, 0.8.1) https://github.com/locustio/locust/raw/master/LICENSE MarkupSafe (BSD, 0.23) https://github.com/mitsuhiko/markupsafe/raw/master/LICENSE -msgpack-python (Apache, 0.4.6) https://github.com/msgpack/msgpack-python/raw/master/COPYING -pyzmq (BSD, 14.5.0) https://github.com/zeromq/pyzmq/raw/master/COPYING.BSD -requests (Apache, 2.6.2) https://github.com/kennethreitz/requests/raw/master/LICENSE -Werkzeug (BSD, 0.10.4) https://github.com/mitsuhiko/werkzeug/raw/master/LICENSE \ No newline at end of file +msgpack-python (Apache, 0.4.2) https://github.com/msgpack/msgpack-python/raw/master/COPYING +pyzmq (BSD, 16.0.2) https://github.com/zeromq/pyzmq/raw/master/COPYING.BSD +requests (Apache, 2.9.1) https://github.com/kennethreitz/requests/raw/master/LICENSE +Werkzeug (BSD, 0.10.4) https://github.com/mitsuhiko/werkzeug/raw/master/LICENSE diff --git a/docker-image/locust-tasks/default.profraw b/docker-image/locust-tasks/default.profraw new file mode 100644 index 0000000..9469615 Binary files /dev/null and b/docker-image/locust-tasks/default.profraw differ diff --git a/docker-image/locust-tasks/requirements.txt b/docker-image/locust-tasks/requirements.txt index 3684955..9a01342 100644 --- a/docker-image/locust-tasks/requirements.txt +++ b/docker-image/locust-tasks/requirements.txt @@ -1,11 +1,11 @@ Flask==0.10.1 -gevent==1.0.1 -greenlet==0.4.5 +gevent==1.2.2 +greenlet==0.4.10 itsdangerous==0.24 Jinja2==2.7.3 -locustio==0.7.2 +locustio==0.8.1 MarkupSafe==0.23 -msgpack-python==0.4.6 -pyzmq==14.5.0 -requests==2.6.2 +msgpack-python==0.4.2 +pyzmq==16.0.2 +requests==2.9.1 Werkzeug==0.10.4 diff --git a/docker-image/locust-tasks/run.sh b/docker-image/locust-tasks/run.sh old mode 100644 new mode 100755 index ba5f684..5190374 --- a/docker-image/locust-tasks/run.sh +++ b/docker-image/locust-tasks/run.sh @@ -27,4 +27,4 @@ fi echo "$LOCUST $LOCUS_OPTS" -$LOCUST $LOCUS_OPTS \ No newline at end of file +$LOCUST $LOCUS_OPTS diff --git a/docker-image/locust-tasks/tasks.py b/docker-image/locust-tasks/tasks.py old mode 100644 new mode 100755 index 6e6fc55..8f14cfe --- a/docker-image/locust-tasks/tasks.py +++ b/docker-image/locust-tasks/tasks.py @@ -39,4 +39,4 @@ def post_metrics(self): class MetricsLocust(HttpLocust): - task_set = MetricsTaskSet \ No newline at end of file + task_set = MetricsTaskSet