diff options
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rwxr-xr-x | docker/instance_run.sh | 17 |
2 files changed, 1 insertions, 21 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a548b03..3695a1b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,11 +31,6 @@ VOLUME /var/lib/mysql ADD . /service WORKDIR /service -# get binary zip from nexus - vfc-nfvo-db -RUN wget -q -O vfc-nfvo-db.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.db&a=vfc-nfvo-db&v=LATEST&e=zip' && \ - unzip vfc-nfvo-db.zip && \ - rm -rf vfc-nfvo-db.zip - EXPOSE 3306 EXPOSE 6379 diff --git a/docker/instance_run.sh b/docker/instance_run.sh index d110109..f72a451 100755 --- a/docker/instance_run.sh +++ b/docker/instance_run.sh @@ -9,17 +9,6 @@ function start_mysql { sleep 1 } -function create_database { - cd /service/vfc/nfvo/db/resources - for ms in $(ls) - do - cd $ms/bin - bash initDB.sh root $MYSQL_ROOT_PASSWORD 3306 127.0.0.1 - cd /service/vfc/nfvo/db/resources - done - cd /service -} - function run_forever { while [ ! -f /var/log/mysql.log ]; do sleep 1 @@ -29,10 +18,6 @@ function run_forever { start_redis_server start_mysql -mysql -uroot -p$MYSQL_ROOT_PASSWORD -e " GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;" +mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;" mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "flush privileges;" -# if [ ! -f dbexist.txt ]; then -# echo 1 > dbexist.txt -# create_database -# fi run_forever |