X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Fdocker-env-conf.sh;h=0e3e200094a9576759f5cd28620aa34351f5baa6;hb=becb332a341a037ff71049ea369a0bc7dfd3ee40;hp=d94a1951c376e02f3f884048b33daf0ba9551697;hpb=affcd0828f0dd0941ba546aca5bce05e8ee1a598;p=modeling%2Fetsicatalog.git

diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
old mode 100644
new mode 100755
index d94a195..0e3e200
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -2,45 +2,36 @@
 
 install_sf(){
 
-    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
     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-genericparser
+    # get binary zip from nexus - modeling-etsicatalog
 
-#    wget -q -O vfc-nfvo-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.genericparser&a=vfc-nfvo-genericparser&v=LATEST&e=zip' && \
-#    unzip vfc-nfvo-genericparser.zip && \
-#    rm -rf vfc-nfvo-genericparser.zip && \
-    wget -q -O vfc-nfvo-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.genericparser&a=vfc-nfvo-genericparser&v=LATEST&e=zip' && \
-    unzip vfc-nfvo-genericparser.zip && \
-    rm -rf vfc-nfvo-genericparser.zip && \
-    pip install --upgrade setuptools pip -i https://mirrors.aliyun.com/pypi/simple/ && \
-
-#    pip install --no-cache-dir --pre -r  /service/vfc/nfvo/genericparser/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/
-    pip install --no-cache-dir --pre -r  /service/modeling/genericparser/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/
+    wget -q -O modeling-etsicatalog.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.etsicatalog&a=modeling-etsicatalog&e=zip&v=${pkg_version}-SNAPSHOT&e=zip" && \
+    unzip modeling-etsicatalog.zip && \
+    rm -rf modeling-etsicatalog.zip && \
+    pip install --upgrade setuptools pip  && \
+    pip install -r /service/modeling/etsicatalog/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
-    fi 
-   
-    sudo chown onap:onap -R /var/log/onap
+       mkdir /var/log/onap
+    fi
+
+    chown onap:onap -R /var/log/onap
     chmod g+s /var/log/onap
-    
+
 }
 
 clean_sf_cache(){