Optimize docker file of VFC-vnflcm

[vfc/gvnfm/vnflcm.git] / lcm / docker / docker-env-conf.sh

diff --git a/lcm/docker/docker-env-conf.sh b/lcm/docker/docker-env-conf.sh
old mode 100644 (file)
new mode 100755 (executable)
index 80fa123..4ae228b
--- a/lcm/docker/docker-env-conf.sh
+++ b/lcm/docker/docker-env-conf.sh
@@ -4,35 +4,32 @@ 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
+    apk --no-cache add python3-dev libffi-dev musl-dev py3-virtualenv
 
     # get binary zip from nexus - vfc-nfvo-catalog
-    wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip'
-    unzip vfc-gvnfm-vnflcm-lcm.zip
+    wget -q -O vfc-gvnfm-vnflcm-lcm.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=${pkg_version}-SNAPSHOT&e=zip" && \
+    unzip vfc-gvnfm-vnflcm-lcm.zip && \
     rm -rf vfc-gvnfm-vnflcm-lcm.zip
     wait
-    pip install --upgrade setuptools pip 
+    pip install --upgrade setuptools pip
     pip install --no-cache-dir --pre -r  /service/vfc/gvnfm/vnflcm/lcm/requirements.txt
+    find  /service -name '*.sh'|xargs chmod a+x
 }
 
 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
+    chown onap:onap -R /service
 }
 
 config_logdir(){
 
     if [ ! -d "/var/log/onap" ]; then
-       sudo mkdir /var/log/onap
+       mkdir /var/log/onap
     fi 
    
-    sudo chown onap:onap -R /var/log/onap
+    chown onap:onap -R /var/log/onap
     chmod g+s /var/log/onap
     
 }