aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authordyh <dengyuanhong@chinamobile.com>2020-03-16 10:49:27 +0800
committerdyh <dengyuanhong@chinamobile.com>2020-03-16 10:49:50 +0800
commit92120b55edd24949168723923ed23393f9b7f374 (patch)
tree2611eab3e963ffec4b9dc920175e52ebfe502b6e /docker
parent9275a20370886fbcec4a4a85b2d989c1f3593e84 (diff)
optimize the docker image
Change-Id: I8368a55f0b4467c7aebb2ca977568686243dfddc Issue-ID: MODELING-343 Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-entrypoint.sh3
-rwxr-xr-xdocker/docker-env-conf.sh11
2 files changed, 4 insertions, 10 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 8666f69..b6b09a5 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 6bd689e..209e124 100755
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -13,26 +13,23 @@ install_sf(){
rm -rf modeling-etsicatalog.zip && \
pip install --upgrade setuptools pip && \
pip install --no-cache-dir --pre -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
+ mkdir /var/log/onap
fi
- sudo chown onap:onap -R /var/log/onap
+ chown onap:onap -R /var/log/onap
chmod g+s /var/log/onap
}