aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-03-12 16:44:41 +0800
committeryangyan <yangyanyj@chinamobile.com>2020-03-12 16:44:46 +0800
commit24b92a2210c2063935d313f08e1da1e9cee45f3f (patch)
tree29976d079ad9ec2b690eb2a43c02ecb9a0ea5b67
parent43555c09b83dd18e9afe97cedd028a68e4f5e460 (diff)
Optimize docker file of VFC-catalogHEADmasterfrankfurt
Change-Id: If052af18809702a8ff45e2b5da3b7a8120eacd07 Issue-ID: VFC-1647 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rwxr-xr-xdocker/docker-entrypoint.sh3
-rwxr-xr-xdocker/docker-env-conf.sh15
2 files changed, 5 insertions, 13 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 89136672..759c2713 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 75a9d3f0..504c0bd8 100755
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -13,28 +13,23 @@ install_sf(){
rm -rf vfc-nfvo-catalog.zip && \
pip install --upgrade setuptools pip && \
pip install --no-cache-dir --pre -r /service/vfc/nfvo/catalog/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(){