summaryrefslogtreecommitdiffstats
path: root/nokia/vnfmdriver/vfcadaptorservice/docker
diff options
context:
space:
mode:
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/docker')
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile5
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh2
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh9
3 files changed, 3 insertions, 13 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
index f538ccf2..05d261a9 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
@@ -10,10 +10,6 @@ FROM centos:7
RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
RUN sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo
-
-RUN rpm --rebuilddb
-RUN yum clean all
-
RUN yum update -y
RUN yum install -y wget unzip socat java-1.8.0-openjdk-headless
@@ -29,7 +25,6 @@ RUN wget -q http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm && rp
RUN yum -y update
RUN yum -y install -y mysql-server
RUN mysql_install_db --user=mysql --datadir=/var/lib/mysql
-RUN chown mysql:mysql /var/lib/mysql -R
EXPOSE 3306
RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/my.cnf
COPY init-mysql.sh .
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh
index 8bfc9b35..94f8d5bc 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh
@@ -16,9 +16,7 @@
#
# Config MSB address
MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
-
sed -i "s|127\.0\.0\.1|${MSB_IP}|" etc/conf/restclient.json
-
cat etc/conf/restclient.json
# Set self IP
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
index 1b55e980..69e2b25d 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh
@@ -17,12 +17,9 @@
# Config mysql credentials
function start_mysql {
- echo "start mysql in instance_init ... "
- service mysql start > myout_instance_init.file 2>&1
- cat myout_instance_init.file
- service mysql status > myout_instance_init_mysql_status.file 2>&1
- cat myout_instance_init_mysql_status.file
- sleep 5
+ echo "start mysql ... "
+ service mysql start
+ sleep 1
}
start_mysql