From 62615575b2b7919b1eab11ad2f1a3039da43e413 Mon Sep 17 00:00:00 2001
From: fujinhua <fu.jinhua@zte.com.cn>
Date: Mon, 22 Apr 2019 10:05:28 +0800
Subject: Update dockerfile for ztevnfmdriver

Change-Id: I0c919fef933e664d21f7c986ba5ba0bf84ea4de5
Issue-ID: VFC-1307
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---
 zte/vmanager/docker/Dockerfile         | 30 +++-----------------
 zte/vmanager/docker/docker-env-conf.sh | 51 ++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 26 deletions(-)
 create mode 100755 zte/vmanager/docker/docker-env-conf.sh

diff --git a/zte/vmanager/docker/Dockerfile b/zte/vmanager/docker/Dockerfile
index 06be817e..3fbaa38d 100644
--- a/zte/vmanager/docker/Dockerfile
+++ b/zte/vmanager/docker/Dockerfile
@@ -1,40 +1,18 @@
-FROM ubuntu:14.04
+FROM python:2-alpine
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
 ARG PKG_VERSION
-
 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 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 wget && \
-    apt-get install -y unzip && \
-    apt-get install -y curl && \
-    apt-get install -y build-essential && \
-    apt-get install -y libssl-dev && \
-    apt-get install -y libffi-dev
+ENV pkg_verison=${PKG_VERSION}
 
 ADD . /service
 WORKDIR /service
 
-# get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
-RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=${PKG_VERSION}-SNAPSHOT&e=zip" && \
-    unzip vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip && \
-    rm -rf vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip
-
-WORKDIR /service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager
-RUN pip install -r requirements.txt
+RUN sh /service/docker-env-conf.sh
 
 EXPOSE 8410
-
+USER onap
 WORKDIR /service
 ENTRYPOINT vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/docker-entrypoint.sh
diff --git a/zte/vmanager/docker/docker-env-conf.sh b/zte/vmanager/docker/docker-env-conf.sh
new file mode 100755
index 00000000..95886b93
--- /dev/null
+++ b/zte/vmanager/docker/docker-env-conf.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+install_sf(){
+
+    apk --no-cache update
+    apk --no-cache add bash curl gcc wget mysql-client openssl-dev
+    apk --no-cache add python-dev libffi-dev musl-dev py2-virtualenv
+
+    # get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
+    RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=${pkg_verison}-SNAPSHOT&e=zip" && \
+    unzip vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip && \
+    rm -rf vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip
+    wait
+    pip install --upgrade setuptools pip
+    pip install --no-cache-dir --pre -r  /service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/requirements.txt
+}
+
+add_user(){
+
+    apk --no-cache add sudo
+    addgroup -g 1000 -S onap
+    adduser onap -D -G onap -u 1000
+    chmod u+w /etc/sudoers
+    sed -i '/User privilege/a\\onap    ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers
+    chmod u-x /etc/sudoers
+    sudo chown onap:onap -R /service
+}
+
+config_logdir(){
+
+    if [ ! -d "/var/log/onap" ]; then
+       sudo mkdir /var/log/onap
+    fi 
+   
+    sudo chown onap:onap -R /var/log/onap
+    chmod g+s /var/log/onap
+    
+}
+
+clean_sf_cache(){
+
+    rm -rf /var/cache/apk/*
+    rm -rf /root/.cache/pip/*
+    rm -rf /tmp/*
+}
+
+install_sf
+wait
+add_user
+config_logdir
+clean_sf_cache
-- 
cgit 1.2.3-korg