diff options
author | wu.zhihui <wu.zhihui1@zte.com.cn> | 2017-01-12 14:59:45 +0800 |
---|---|---|
committer | wu.zhihui <wu.zhihui1@zte.com.cn> | 2017-01-16 12:56:35 +0800 |
commit | 370ea64a90d288c2dba94a849cdea87b0f82b0a3 (patch) | |
tree | c316fe73c0ac53029a2aa96f135ecf3067106061 /legacy/docker | |
parent | 23b627df622eeafafa215ce19764310c1d55dd55 (diff) |
Update Dockerfile
- update OS version to 16.04
- update pip version
JIRA: QTIP-202
Change-Id: Iba90e4b354f2ddb9e1cbc1da191be6b1b6f6a042
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
Diffstat (limited to 'legacy/docker')
-rw-r--r-- | legacy/docker/Dockerfile | 70 | ||||
-rw-r--r-- | legacy/docker/ansible.cfg.default | 2 | ||||
-rw-r--r-- | legacy/docker/supervisord.conf | 13 |
3 files changed, 0 insertions, 85 deletions
diff --git a/legacy/docker/Dockerfile b/legacy/docker/Dockerfile deleted file mode 100644 index 369fa6c8..00000000 --- a/legacy/docker/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -########################################## -#####Docker container for QTIP############ -########################################## - - -FROM ubuntu:14.04 -MAINTAINER Yujun Zhang <zhang.yujunz@zte.com.cn> -LABEL version="0.1" description="OPNFV QTIP Docker container" - -ARG BRANCH=master - -ENV REPOS_DIR /home/opnfv/repos -ENV QTIP_DIR /home/opnfv/repos/qtip -ENV PYTHONPATH /home/opnfv/repos/qtip -ENV HOME /home/opnfv -WORKDIR /home/opnfv - -# Packaged Dependencies -RUN apt-get update && apt-get install -y \ -software-properties-common \ -wget \ -git \ -gcc \ -ssh \ -expect \ -python-matplotlib \ -python-dev \ -python-pip \ -libjpeg62 \ -libjpeg62-dev \ -zlib1g-dev \ -python-tk \ -curl \ -supervisor \ -python-setuptools \ ---no-install-recommends - -RUN pip install 'setuptools>=17.1' - -RUN apt-add-repository ppa:ansible/ansible -y -RUN apt-key update -y -RUN apt-get update -y -RUN apt-get install ansible --force-yes -y - - -RUN mkdir -p ${REPOS_DIR} -RUN mkdir -p /root/.ssh -RUN mkdir -p $HOME/qtip/logs -RUN mkdir -p $HOME/qtip/results - -RUN chmod 700 /root/.ssh - -#Config ansible -COPY ansible.cfg.default /root/.ansible.cfg - -#Cloning Repos - -RUN git config --global http.sslVerify false -RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip -RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng - -RUN pip install -r $REPOS_DIR/qtip/requirements.txt - -#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/legacy/docker/ansible.cfg.default b/legacy/docker/ansible.cfg.default deleted file mode 100644 index 0451870a..00000000 --- a/legacy/docker/ansible.cfg.default +++ /dev/null @@ -1,2 +0,0 @@ -[defaults] -callback_whitelist = profile_tasks diff --git a/legacy/docker/supervisord.conf b/legacy/docker/supervisord.conf deleted file mode 100644 index a6d457dd..00000000 --- a/legacy/docker/supervisord.conf +++ /dev/null @@ -1,13 +0,0 @@ -[supervisord] -nodaemon=true - -[program:qtip_server] -command=bash -c "cd $REPOS_DIR/qtip&&python qtip/api/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 - |