diff options
| author |   yufei_zhou <yufei.zhou@nokia-sbell.com> | 2017-10-14 18:20:39 +0800 |
|---|---|---|
| committer | yufei_zhou <yufei.zhou@nokia-sbell.com> | 2017-10-14 18:20:39 +0800 |
| commit | ab5c4b66233f7574af81a1e8f751ba70d538a8db (patch) | |
| tree | 3569f0578310cc1e6e1da503e0c169c80fa6455d /nokia/vnfmdriver/vfcadaptorservice/docker | |
| parent | d3c40114e88bb9acf027fc5c046968c4c44b1a0a (diff) | |
Modify service register part
Change-Id: Ie14599005868e60669a8a949dc5c8f23afa80a40
Issue-ID: VFC-53
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/docker')
3 files changed, 2 insertions, 56 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile index ccd5173c..6bcd1dbb 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile @@ -41,7 +41,7 @@ RUN wget -q -O nfvo-driver-vnfm-nokia-1.0.0-SNAPSHOT.zip "https://nexus.onap.org # Set permissions RUN find . -type d -exec chmod o-w {} \; RUN find . -name "*.sh" -exec chmod +x {} \; -EXPOSE 8485 +EXPOSE 8486 RUN echo ONAP nfvo-driver-vnfm-nokia 1.0.0-SNAPSHOT "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm&a=vfcadaptor-deployment&v=LATEST&e=zip" > ONAP_VERSION diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak deleted file mode 100644 index cf567be3..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Copyright 2017, Nokia Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually. -# -# nfvo-driver-vnfm-nokia/target/docker-entrypoint.sh -# -DIRNAME=`dirname $0` -DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd` -echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" -cd ${DOCKER_BUILD_DIR} - -BUILD_ARGS="--no-cache" -ORG="onap" -VERSION="1.0.0-SNAPSHOT" -PROJECT="vfc" -IMAGE="nfvo/svnfm/nokia" -DOCKER_REPOSITORY="nexus3.onap.org:10003" -IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" - -if [ $HTTP_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" -fi -if [ $HTTPS_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" -fi - -function build_image { - echo "Start build docker image: ${IMAGE_NAME}" - docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest . -} - -function push_image { - echo "Start push docker image: ${IMAGE_NAME}" - docker push ${IMAGE_NAME}:${VERSION} - docker push ${IMAGE_NAME}:latest -} - -build_image -push_image diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh index 50fc17f5..a11592cf 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh @@ -17,6 +17,6 @@ # Wait for mysql to initialize; Set mysql root password echo Initializing mysql for i in {1..10}; do - /usr/bin/mysqladmin -u root password 'rootpass' &> /dev/null && break + /usr/bin/mysqladmin -u vnfm password 'vnfmpass' &> /dev/null && break sleep $i done |