diff options
| author |   Rex Lee <limingjiang@huawei.com> | 2016-12-05 06:33:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-05 06:33:43 +0000 |
| commit | 310eec58b65fdea6ded88f4271d93a8eaf7a599a (patch) | |
| tree | 662d185caef47631f30e80df3bd76431277f28a1 /docker | |
| parent | 65e770afb564045d647abe2bdc2892ebe1130015 (diff) | |
| parent | ffd0de5f9728e5c6d4a03eefc0d9782b530526ab (diff) | |
Merge "Making nginx and uwsgi service start when run docker by using supervisor"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 048804dc5..3dd94019a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -48,6 +48,7 @@ RUN apt-get update && apt-get install -y \ nginx \ uwsgi \ uwsgi-plugin-python \ + supervisor \ python-setuptools && \ easy_install -U setuptools @@ -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"] |