diff options
| author |   Yuanhong Deng <dengyuanhong@chinamobile.com> | 2020-09-21 07:15:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-21 07:15:23 +0000 |
| commit | 6dba8a807a492fe1632f9fc66215e007d165abb3 (patch) | |
| tree | 64ae943932d0c9405be9c38f1a35018cb41ee9d1 | |
| parent | e778a254251bea3e2cb6349262aea4f8cfa22e95 (diff) | |
| parent | 5f9e18ca0a4994236f53f2ceaf1fb357ee4afea3 (diff) | |
Merge "Two main process in vfc huawei vnfm pod Issue-ID: VFC-1692"
3 files changed, 1 insertions, 39 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile index a257f9e5..696d4cd7 100644 --- a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile +++ b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile @@ -6,9 +6,6 @@ ENV CATALINA_HOME /service ADD . /service WORKDIR /service RUN bash docker-env-config.sh -VOLUME /var/lib/mysql - -EXPOSE 8482 USER onap ENTRYPOINT /service/docker-entrypoint.sh diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh b/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh index e61bbd19..9cfd4dca 100755 --- a/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh +++ b/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh @@ -46,17 +46,11 @@ echo # Configure service based on docker environment variables ./instance-config.sh -# Start mysql -/usr/bin/mysqld_safe & - # Perform one-time config if [ ! -e init.log ]; then # Perform workarounds due to defects in release binary ./instance-workaround.sh - # Init mysql; set root password - ./init-mysql.sh - # microservice-specific one-time initialization ./instance-init.sh diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh b/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh index 7c4d235a..3ae4f986 100644 --- a/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh +++ b/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh @@ -2,33 +2,7 @@ add_user(){ useradd onap -} - -set_up_mysql_jdk(){ - - sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf - sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo - yum -y update - - yum -y install wget unzip socat java-11-openjdk-headless - sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security - - # Set up mysql - wget -q http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm && \ - rpm -ivh mysql-community-release-el7-5.noarch.rpm && \ - rm -f mysql-community-release-el7-5.noarch.rpm - yum -y update - yum -y install mysql-server - mysql_install_db --user=onap --datadir=/var/lib/mysql - chown onap:onap -R /var/run/mysqld - chmod g+s /var/run/mysqld - setfacl -d --set u:onap:rwx /var/run/mysqld - chown onap:onap /var/log/mysqld.log - chmod g+s /var/log/mysqld.log - chown onap:onap -R /var/lib/mysql-files - chmod g+s /var/lib/mysql-files - setfacl -d --set u:onap:rwx /var/lib/mysql-files - chown onap:onap /etc/my.cnf + chown onap:onap -R /service } set_up_tomcat(){ @@ -61,9 +35,6 @@ clean_sf_cache(){ yum clean all } -add_user -set_up_mysql_jdk -wait set_up_tomcat wait clean_sf_cache |