aboutsummaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 048804dc5..23afef74e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,8 +48,9 @@ RUN apt-get update && apt-get install -y \
nginx \
uwsgi \
uwsgi-plugin-python \
+ supervisor \
python-setuptools && \
- easy_install -U setuptools
+ easy_install -U setuptools==30.0.0
RUN apt-get -y autoremove && \
apt-get clean
@@ -73,3 +74,4 @@ ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/op
ADD http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img /home/opnfv/images/
COPY ./exec_tests.sh /usr/local/bin/
+CMD ["/usr/bin/supervisord"]