X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Fdocker-env-conf.sh;h=aa79088538ce2696ee2c341c1530d921e2ea5f24;hb=a32c2b20207885d895bd96204cc166fca14db97b;hp=985aadac9f15b434682b40107c17a2f10e7f6a4a;hpb=d91657fce78f76ddb7467651c6e9647c6fcf9e67;p=modeling%2Fetsicatalog.git diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh index 985aada..aa79088 100755 --- a/docker/docker-env-conf.sh +++ b/docker/docker-env-conf.sh @@ -2,19 +2,17 @@ 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 python36-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 modeling-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.toscaparsers.genericparser&a=modeling-toscaparsers-genericparserr&v=LATEST&e=zip' && \ - unzip modeling-genericparser.zip && \ - rm -rf modeling-genericparser.zip && \ + wget -q -O modeling-etsicatalog.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.genericparser&a=modeling-genericparser&e=zip&v=${pkg_version}-SNAPSHOT&e=zip" && \ + unzip modeling-etsicatalog.zip && \ + rm -rf modeling-etsicatalog.zip && \ pip install --upgrade setuptools pip && \ - - pip install --no-cache-dir --pre -r /service/modeling/toscaparsers/genericparser/requirements.txt + pip install --no-cache-dir --pre -r /service/modeling/etsicatalog/requirements.txt } add_user(){ @@ -32,11 +30,11 @@ config_logdir(){ if [ ! -d "/var/log/onap" ]; then sudo mkdir /var/log/onap - fi - + fi + sudo chown onap:onap -R /var/log/onap chmod g+s /var/log/onap - + } clean_sf_cache(){