From 5f2f918333ee3997a6d3151b126df714d9bb75f4 Mon Sep 17 00:00:00 2001 From: yangyan Date: Thu, 5 Mar 2020 10:42:32 +0800 Subject: Remove sudo capability for onap user for VF-C db docker Change-Id: Ifec6aeee5360894c3bd78b7812dab82d1144efe0 Issue-ID: VFC-1640 Signed-off-by: yangyan --- docker/docker-env-config.sh | 30 +++++++++++++++++++----------- docker/instance_run.sh | 2 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/docker/docker-env-config.sh b/docker/docker-env-config.sh index e059ce6..eccdd9e 100644 --- a/docker/docker-env-config.sh +++ b/docker/docker-env-config.sh @@ -1,7 +1,13 @@ #!/bin/bash -install_sf(){ +add_user(){ + + useradd onap + chown onap:onap -R /service +} +install_sf(){ + sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny echo "set backspace=2" >> /etc/vim/vimrc.tiny @@ -11,15 +17,17 @@ install_sf(){ apt-get update apt-get install -y gcc libmysqlclient-dev redis-server mysql-server-5.6 mysql-client-5.6 wget unzip build-essential libssl-dev libffi-dev sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf -} - -add_user(){ - - useradd onap - chmod u+w /etc/sudoers - sed -i '/User privilege specification/a\onap ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers - chmod u-w /etc/sudoers - chown onap:onap -R /service + mysql_install_db --user=onap --datadir=/var/lib/mysql + chown -R onap:onap /usr/include/mysql + chown -R onap:onap /usr/share/mysql + chown -R onap:onap /usr/lib/perl5/auto/DBD/mysql + chown -R onap:onap /usr/lib/perl5/DBD/mysql + chown -R onap:onap /usr/bin/mysql + chown -R onap:onap /var/lib/mysql + chown -R onap:onap /var/log/mysql + chown -R onap:onap /etc/init.d/mysql + chown -R onap:onap /etc/mysql + chown -R onap:onap /var/run/mysqld/ } @@ -30,7 +38,7 @@ clean_sf_cache(){ apt-get autoremove } +add_user install_sf wait -add_user clean_sf_cache diff --git a/docker/instance_run.sh b/docker/instance_run.sh index 3db73aa..6338e9d 100755 --- a/docker/instance_run.sh +++ b/docker/instance_run.sh @@ -5,7 +5,7 @@ function start_redis_server { } function start_mysql { - sudo service mysql start + /usr/bin/mysqld_safe & sleep 1 } -- cgit 1.2.3-korg