Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Locust 0.8 #27

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Upgrade to Locust 0.8 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
72a67fe
Locust 0.8 Upgrade
santhh Jul 30, 2018
5d473fa
changing to bash
santhh Jul 30, 2018
f01c62e
Rolling back task.py for merge
santhh Jul 30, 2018
67f342d
rolling back master controller
santhh Jul 30, 2018
f41e90c
rolling back controller
santhh Jul 30, 2018
313b96c
rolling back run.sh
santhh Jul 30, 2018
7e593ba
Update tasks.py
santhh Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions docker-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <parikhs@google.com>

Expand All @@ -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
Expand Down
Binary file added docker-image/default.profraw
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions docker-image/licenses/licenses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
Binary file added docker-image/locust-tasks/default.profraw
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions docker-image/locust-tasks/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker-image/locust-tasks/run.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ fi

echo "$LOCUST $LOCUS_OPTS"

$LOCUST $LOCUS_OPTS
$LOCUST $LOCUS_OPTS
2 changes: 1 addition & 1 deletion docker-image/locust-tasks/tasks.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ def post_metrics(self):


class MetricsLocust(HttpLocust):
task_set = MetricsTaskSet
task_set = MetricsTaskSet