Merge pull request #18 from butomo1989/master

Cleaned up Dockerfile
zalando-incubator · Jun 30, 2017 · 28caf7c · 28caf7c
2 parents 57a16f8 + 7df0c59
commit 28caf7c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,7 @@
++*/*.pyc
+
+# Coverage
+.coverage
+coverage.xml
+xunit.xml
+coverage/*
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,6 @@ coverage/*
 
 # Reports
 reports/*
+
+# Sample load test script
+simple.py
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.opensource.zalan.do/stups/ubuntu:16.04.2-5
+FROM registry.opensource.zalan.do/stups/ubuntu:16.04.2-6
 
 #=======================
 # General Configuration
@@ -22,7 +22,8 @@ RUN pip install -r /tmp/requirements.txt
 #=====================
 # Start docker-locust
 #=====================
-COPY . /opt/
+COPY src /opt/src/
+COPY setup.cfg /opt/
 WORKDIR /opt
 ENV PYTHONPATH .
 CMD ["/usr/bin/python", "src/start.py"]
diff --git a/local.sh b/local.sh
@@ -36,7 +36,7 @@ ________________________________________________________________________________
 _________________________________________________________________________________
 EOF
 
-    IMAGE="registry.opensource.zalan.do/tip/docker-locust:0.7.3-p0"
+    IMAGE="registry.opensource.zalan.do/tip/docker-locust:0.7.3-p1"
     echo "Used image: $IMAGE"
 
     echo "----------------------------------------------"

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,9 @@
-autopep8==1.2.4
-coverage==4.2
+autopep8==1.3.2
+coverage==4.4.1
+enum34==1.1.6
 flake8>=2.5.1,<2.6
 locustio==0.7.3
 mock==2.0.0
 nose==1.3.7
-requests>=2.9.0
-requests_mock>=1.0.0
+requests>=2.18.1
+requests_mock>=1.3.0