diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/docker')
7 files changed, 78 insertions, 14 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh index 8eb43b0b..914f5f6f 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh @@ -1,4 +1,20 @@ #!/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. +# + DIRNAME=`dirname $0` DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd` echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak new file mode 100644 index 00000000..cf567be3 --- /dev/null +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak @@ -0,0 +1,54 @@ +#!/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/docker-entrypoint.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh index 1d235f61..ee6cb2d4 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 Huawei Technologies Co., Ltd. +# 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. @@ -15,10 +15,6 @@ # limitations under the License. # # -# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually. -# -# nfvo-driver-vnfm-huawei/target/docker-entrypoint.sh -# if [ -z "$SERVICE_IP" ]; then export SERVICE_IP=`hostname -i` diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh index ce9d31db..94f8d5bc 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 Huawei Technologies Co., Ltd. +# 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. diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh index 3975b5ad..39e85026 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 Huawei Technologies Co., Ltd. +# 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. @@ -16,8 +16,6 @@ # # Config mysql credentials -#sed -i "s|rootpass|rootpass|" webapps/ROOT/WEB-INF/classes/spring/Vnfmadapter/services.xml - # Initialize MySQL schema cd bin -./init_db.sh root rootpass 127.0.0.1 3306 +./init_db.sh vnfm vnfmpass 127.0.0.1 3306 diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-run.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-run.sh index 5078e636..c6eda6d4 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-run.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016-2017 Huawei Technologies Co., Ltd. +# Copyright 2016-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. @@ -17,7 +17,7 @@ # Start microservice cd bin ./startup.sh -while [ ! -e ../logs/vnfmadapterservice.log ]; do +while [ ! -e ../logs/vfcadaptor.log ]; do sleep 1 done -tail -F ../logs/vnfmadapterservice.log +tail -F ../logs/vfcadaptor.log diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-workaround.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-workaround.sh index d9637aea..24c3a7ae 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-workaround.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-workaround.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 CMCC Technologies Co., Ltd. +# 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. |