Code Review
/
modeling
/
etsicatalog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrage etsicatalog to ensure interface support https protocol
[modeling/etsicatalog.git]
/
docker
/
docker-env-conf.sh
diff --git
a/docker/docker-env-conf.sh
b/docker/docker-env-conf.sh
index
51f98c5
..
9f70fca
100755
(executable)
--- a/
docker/docker-env-conf.sh
+++ b/
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 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 python
3-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.genericparser&a=modeling-genericparser&e=zip&v=${pkg_version}-SNAPSHOT&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.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 --upgrade setuptools pip && \
- pip install --no-cache-dir --pre -r /service/modeling/genericparser/requirements.txt
+ pip install --no-cache-dir --pre -r /service/modeling/etsicatalog/requirements.txt
+ find /service -name '*.sh'|xargs chmod a+x
}
add_user(){
}
add_user(){
- apk --no-cache add sudo
addgroup -g 1000 -S onap && \
adduser onap -D -G onap -u 1000 && \
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
}
config_logdir(){
if [ ! -d "/var/log/onap" ]; then
-
sudo
mkdir /var/log/onap
+ mkdir /var/log/onap
fi
fi
-
sudo
chown onap:onap -R /var/log/onap
+ chown onap:onap -R /var/log/onap
chmod g+s /var/log/onap
}
chmod g+s /var/log/onap
}