diff options
| author |   zhifeng jiang <jiang.zhifeng@zte.com.cn> | 2016-10-25 00:58:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-25 00:58:57 +0000 |
| commit | 69971c7b3c48d665e919c1ba1df8b1b0ce2bfa57 (patch) | |
| tree | 2e1d84f5051c801d46b31e6b34026cf34ec12f66 | |
| parent | c40c2db74a1d59496a8c999cfc9c0a2431fda767 (diff) | |
| parent | 22ad814adeae1dc739a6fe847b4a77c3aeb4acdc (diff) | |
Merge "Use supervisor to start qtip_server in docker."
| -rw-r--r-- | docker/Dockerfile | 10 | ||||
| -rw-r--r-- | docker/supervisord.conf | 13 |
2 files changed, 22 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 05286b09..204400cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -35,6 +35,7 @@ libjpeg62-dev \ zlib1g-dev \ python-tk \ curl \ +supervisor \ --no-install-recommends RUN apt-add-repository ppa:ansible/ansible -y @@ -60,4 +61,11 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng RUN pip install -r $REPOS_DIR/qtip/requirements.txt -CMD cd $REPOS_DIR/qtip && python restful_server/qtip_server.py>$HOME/qtip/logs/run.log +#Config supervisor + +RUN mkdir -p /var/log/supervisor +RUN locale-gen en_US en_US.UTF-8 +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf + + +CMD ["/usr/bin/supervisord"] diff --git a/docker/supervisord.conf b/docker/supervisord.conf new file mode 100644 index 00000000..35d16c7e --- /dev/null +++ b/docker/supervisord.conf @@ -0,0 +1,13 @@ +[supervisord] +nodaemon=true + +[program:qtip_server] +command=bash -c "cd $REPOS_DIR/qtip&&python restful_server/qtip_server.py" +numprocs=1 +autostart=true +autorestart=true +user=root +environment=INSTALLER_TYPE="%(ENV_INSTALLER_TYPE)s",INSTALLER_IP="%(ENV_INSTALLER_IP)s",NODE_NAME="%(ENV_NODE_NAME)s" +stdout_logfile=/var/log/supervisor/%(program_name)s.log +stderr_logfile=/var/log/supervisor/%(program_name)s.log + |