From 370ea64a90d288c2dba94a849cdea87b0f82b0a3 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Thu, 12 Jan 2017 14:59:45 +0800 Subject: Update Dockerfile - update OS version to 16.04 - update pip version JIRA: QTIP-202 Change-Id: Iba90e4b354f2ddb9e1cbc1da191be6b1b6f6a042 Signed-off-by: wu.zhihui --- docker/Dockerfile | 67 +++++++++++++++++++++++++++++++++++++ docker/ansible.cfg.default | 2 ++ docker/supervisord.conf | 13 ++++++++ legacy/docker/Dockerfile | 70 --------------------------------------- legacy/docker/ansible.cfg.default | 2 -- legacy/docker/supervisord.conf | 13 -------- 6 files changed, 82 insertions(+), 85 deletions(-) create mode 100644 docker/Dockerfile create mode 100644 docker/ansible.cfg.default create mode 100644 docker/supervisord.conf delete mode 100644 legacy/docker/Dockerfile delete mode 100644 legacy/docker/ansible.cfg.default delete mode 100644 legacy/docker/supervisord.conf diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..f2a543e6 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,67 @@ +########################################## +#####Docker container for QTIP############ +########################################## + +FROM ubuntu:16.04 +MAINTAINER Yujun Zhang +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 \ +&& rm -rf /var/lib/apt/lists/* + +RUN pip install -U pip +RUN pip install 'setuptools>=17.1' + +RUN apt-add-repository ppa:ansible/ansible -y +RUN apt-key update -y +RUN apt-get update && apt-get install ansible -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/docker/ansible.cfg.default b/docker/ansible.cfg.default new file mode 100644 index 00000000..0451870a --- /dev/null +++ b/docker/ansible.cfg.default @@ -0,0 +1,2 @@ +[defaults] +callback_whitelist = profile_tasks diff --git a/docker/supervisord.conf b/docker/supervisord.conf new file mode 100644 index 00000000..a6d457dd --- /dev/null +++ b/docker/supervisord.conf @@ -0,0 +1,13 @@ +[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 + 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 -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 - -- cgit 1.2.3-korg