Merge "change docker image name tp openstack-lenovo"

2 files changed, 77 insertions, 77 deletions

diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh
index 7e440d93..1e5bffdc 100755
--- a/lenovo/docker/build_image.sh
+++ b/lenovo/docker/build_image.sh
@@ -1,48 +1,48 @@
-#!/bin/bash

-# Copyright (c) 2018 Intel 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}"

-cd ${DOCKER_BUILD_DIR}

-

-BUILD_ARGS="--no-cache"

-ORG="onap"

-VERSION="1.3.0-SNAPSHOT"

-STAGING="1.3.0-STAGING"

-PROJECT="multicloud"

-IMAGE="openstack-lenovo"

-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 {

-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .

-}

-

-function push_image {

-    docker push ${IMAGE_NAME}:${VERSION}

-    docker push ${IMAGE_NAME}:latest

-    docker push ${IMAGE_NAME}:${STAGING}

-}

-

-build_image

-push_image

+#!/bin/bash
+# Copyright (c) 2018 Intel 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}"
+cd ${DOCKER_BUILD_DIR}
+
+BUILD_ARGS="--no-cache"
+ORG="onap"
+VERSION="1.3.0-SNAPSHOT"
+STAGING="1.3.0-STAGING"
+PROJECT="multicloud"
+IMAGE="openstack-lenovo"
+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 {
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .
+}
+
+function push_image {
+    docker push ${IMAGE_NAME}:${VERSION}
+    docker push ${IMAGE_NAME}:latest
+    docker push ${IMAGE_NAME}:${STAGING}
+}
+
+build_image
+push_image
diff --git a/lenovo/run.sh b/lenovo/run.sh
index 2420d2d4..e5da37c3 100755
--- a/lenovo/run.sh
+++ b/lenovo/run.sh
@@ -1,30 +1,30 @@
-#!/bin/bash

-# Copyright (c) 2017-2018 Lenovo Systems, Inc.

-#

-# 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.

-

-memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid

-export PYTHONPATH=lib/share

-

-#nohup python manage.py runserver 0.0.0.0:9010 2>&1 &

-nohup uwsgi --http :9010 --module thinkcloud.wsgi --master --processes 4 &

-

-logDir="/var/log/onap/multicloud/openstack/lenovo"

-if [ ! -x  $logDir  ]; then

-       mkdir -p $logDir

-fi

-while [ ! -f $logDir/thinkcloud.log ]; do

-    sleep 1

-done

-

+#!/bin/bash
+# Copyright (c) 2017-2018 Lenovo Systems, Inc.
+#
+# 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.
+
+memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
+export PYTHONPATH=lib/share
+
+#nohup python manage.py runserver 0.0.0.0:9010 2>&1 &
+nohup uwsgi --http :9010 --module thinkcloud.wsgi --master --processes 4 &
+
+logDir="/var/log/onap/multicloud/openstack/lenovo"
+if [ ! -x  $logDir  ]; then
+       mkdir -p $logDir
+fi
+while [ ! -f $logDir/thinkcloud.log ]; do
+    sleep 1
+done
+
 tail -F $logDir/thinkcloud.log
\ No newline at end of file