Modify catalog docker file

Change-Id: I272d0cf873d5aecee47c444b9d2e258237c944fa
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Issue-ID: VFC-1360

1 files changed, 2 insertions, 37 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1dc2a485..68570116 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,48 +1,13 @@
-FROM ubuntu:14.04
+FROM python:2-alpine
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
-
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
-
-RUN sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny
-RUN echo "set backspace=2" >> /etc/vim/vimrc.tiny
-
-RUN apt-get update && \
-    apt-get install -y wget unzip gcc libssl-dev && \
-    apt-get install -y python-virtualenv && \
-    apt-get install -y python-setuptools && \
-    apt-get install -y python-dev && \
-    apt-get install -y python-pip && \
-    apt-get install -y gcc && \
-    apt-get install -y libmysqlclient-dev && \
-    apt-get install -y mysql-client && \
-    apt-get install -y wget && \
-    apt-get install -y unzip && \
-    apt-get install -y curl && \
-    apt-get install -y build-essential && \
-    apt-get install -y libffi-dev && \
-    groupadd -r onap && useradd -r -g onap onap && \
-    chmod u+w /etc/sudoers && \
-    sed -i '/User privilege/a\\onap    ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers && \
-    chmod u-x /etc/sudoers
-
 ADD . /service
 WORKDIR /service
 
-# get binary zip from nexus - vfc-nfvo-catalog
-RUN wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=LATEST&e=zip' && \
-    unzip vfc-nfvo-catalog.zip && \
-    rm -rf vfc-nfvo-catalog.zip
-
-RUN chown onap:onap -R /service /var/log
-
-WORKDIR /service/vfc/nfvo/catalog
-RUN pip install --upgrade setuptools pip && \
-    pip install --pre -r requirements.txt
-
-RUN apt-get --purge remove -y wget unzip gcc libssl-dev
+RUN sh /service/docker-env-conf.sh
 
 EXPOSE 8806
 USER onap