aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-03-12 16:36:49 +0800
committerYan Yang <yangyanyj@chinamobile.com>2020-03-12 08:39:49 +0000
commite8bf176abec0a4588951633e6a7a1bc89657ea8d (patch)
tree6200f6522d543974706a3cec264ea609c52fa43a
parent7c61fa5da8fd50bb37002418aeb29234d0ce647a (diff)
Optimize docker file of VFC-nslcm
Change-Id: I78e67ea4904dc54f687466994b5c1cf36207ce52 Issue-ID: VFC-1647 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rwxr-xr-xdocker/docker-entrypoint.sh3
-rw-r--r--docker/docker-env-conf.sh16
2 files changed, 5 insertions, 14 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index f4769546..3d9b7949 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-sudo chown onap:onap -R /service
-find /service -name '*.sh'|xargs chmod a+x
-
if [ -z "$SERVICE_IP" ]; then
export SERVICE_IP=`hostname -i`
fi
diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index 89eaac95..bcb17c0d 100644
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -10,29 +10,23 @@ install_sf(){
rm -rf vfc-nfvo-lcm.zip && \
pip install --upgrade setuptools pip && \
pip install --pre -r /service/vfc/nfvo/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
- 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(){