From 149035093cac02a047aaa0436487ca67e95da0d9 Mon Sep 17 00:00:00 2001 From: xudan Date: Sun, 8 Jul 2018 23:45:44 -0400 Subject: Update the dockerfile for 2 docker images 1. Update the Dockerfile for 2 docker images 2. Update the docker-compose.yml with the new docker repo JIRA: DOVETAIL-671 Change-Id: Idd0d676568a3aa2a63a1429288f984618281e13a Signed-off-by: xudan --- docker/Dockerfile | 72 ----------------------------------------------- docker/Dockerfile.api | 72 +++++++++++++++++++++++++++++++++++++++++++++++ docker/Dockerfile.web | 8 +++--- docker/docker-compose.yml | 4 +-- 4 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 docker/Dockerfile create mode 100644 docker/Dockerfile.api diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index f71423f..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -####################################################### -# Docker container for OPNFV-TESTAPI -####################################################### -# Purpose: run opnfv-testapi for gathering test results -# -# Maintained by SerenaFeng -# Build: -# $ docker build -t opnfv/testapi:tag . -# -# Execution: -# $ docker run -dti -p 8001:8000 \ -# -e "base_url=http://10.63.243.17:8001" \ -# -e "mongodb_url=mongodb://10.63.243.17:27017/" \ -# opnfv/testapi:tag -# -# NOTE: providing swagger_url, mongodb_url is optional. -# If not provided, it will use the default one -# configured in config.ini -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# - -FROM ubuntu:14.04 -MAINTAINER SerenaFeng -LABEL version="v1" description="OPNFV TestAPI Docker container" - -ARG BRANCH=master - -ENV HOME /home - -# Packaged dependencies -RUN apt-get update && apt-get install -y \ -curl \ -git \ -gcc \ -wget \ -python-dev \ -python-pip \ -crudini \ -libffi-dev \ -libssl-dev \ -libxml2-dev \ -libxslt1-dev \ ---no-install-recommends - -RUN pip install -U setuptools - -WORKDIR /home - -#RUN pip install --upgrade pip - -RUN git config --global http.sslVerify false - -RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git - -WORKDIR /home/dovetail -RUN git checkout -f $BRANCH - -RUN mkdir -p /home/testapi -RUN mkdir -p /home/testapi/logs/api -RUN cp -rf /home/dovetail/cvp/* /home/testapi - -WORKDIR /home/dovetail/cvp -RUN pip install -r requirements.txt -RUN bash install.sh - -RUN sed -i '152,152s/)/,\ verify=False)/g' /usr/local/lib/python2.7/dist-packages/cas.py - -CMD ["bash", "docker/start-server.sh"] diff --git a/docker/Dockerfile.api b/docker/Dockerfile.api new file mode 100644 index 0000000..a577a49 --- /dev/null +++ b/docker/Dockerfile.api @@ -0,0 +1,72 @@ +####################################################### +# Docker container for OPNFV-TESTAPI +####################################################### +# Purpose: run opnfv-testapi for gathering test results +# +# Maintained by SerenaFeng +# Build: +# $ docker build -t opnfv/testapi:tag . +# +# Execution: +# $ docker run -dti -p 8001:8000 \ +# -e "base_url=http://10.63.243.17:8001" \ +# -e "mongodb_url=mongodb://10.63.243.17:27017/" \ +# opnfv/testapi:tag +# +# NOTE: providing swagger_url, mongodb_url is optional. +# If not provided, it will use the default one +# configured in config.ini +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# + +FROM ubuntu:14.04 +MAINTAINER SerenaFeng +LABEL version="v2" description="API for OVP web portal backend" + +ARG BRANCH=master + +ENV HOME /home + +# Packaged dependencies +RUN apt-get update && apt-get install -y \ +curl \ +git \ +gcc \ +wget \ +python-dev \ +python-pip \ +crudini \ +libffi-dev \ +libssl-dev \ +libxml2-dev \ +libxslt1-dev \ +--no-install-recommends + +RUN pip install -U setuptools + +WORKDIR /home + +#RUN pip install --upgrade pip + +RUN git config --global http.sslVerify false + +RUN git clone https://gerrit.opnfv.org/gerrit/dovetail-webportal + +WORKDIR /home/dovetail-webportal +RUN git checkout -f $BRANCH + +RUN mkdir -p /home/testapi +RUN mkdir -p /home/testapi/logs/api +RUN cp -rf /home/dovetail-webportal/* /home/testapi + +WORKDIR /home/dovetail-webportal +RUN pip install -r requirements.txt +RUN bash install.sh + +RUN sed -i '152,152s/)/,\ verify=False)/g' /usr/local/lib/python2.7/dist-packages/cas.py + +CMD ["bash", "docker/start-server.sh"] diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index 9f992df..438ada6 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -7,7 +7,7 @@ FROM ubuntu:16.04 MAINTAINER Leo Wang -LABEL version="v1" description="CVP nginx" +LABEL version="v2" description="OVP nginx" ARG BRANCH=master @@ -19,14 +19,14 @@ RUN apt-get update RUN apt-get install -y git nginx supervisor RUN git config --global http.sslVerify false -RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git +RUN git clone https://gerrit.opnfv.org/gerrit/dovetail-webportal -WORKDIR /home/dovetail +WORKDIR /home/dovetail-webportal RUN git checkout -f $BRANCH RUN mkdir -p /home/testapi -RUN cp -rf /home/dovetail/cvp/* /home/testapi +RUN cp -rf /home/dovetail-webportal/* /home/testapi RUN mkdir /www RUN cp -r /home/testapi/3rd_party/static /www/ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a5da0b9..ca0f36d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -20,7 +20,7 @@ services: expose: - "27017" web: - image: opnfv/dovetail:web.ovp.1.1.2 + image: opnfv/dovetail-webportal-web:latest container_name: cvp-web restart: always env_file: @@ -35,7 +35,7 @@ services: ports: - "8000:8000" cvpapi: - image: opnfv/dovetail:api.ovp.1.1.2 + image: opnfv/dovetail-webportal-api:latest container_name: cvp-cvpapi env_file: - config.env -- cgit 1.2.3-korg