change docker image name tp openstack-lenovo

change fileformat to unix of the *.sh files

Change-Id: Iff6f5db7b87fd59afcd7fe6fb1662aa0d79ab787
Issue-ID: MULTICLOUD-520
Signed-off-by: Changjun Wang <310397125@qq.com>

diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh
index 7e440d9..1e5bffd 100755 (executable)
--- a/lenovo/docker/build_image.sh
+++ b/lenovo/docker/build_image.sh
@@ -1,48 +1,48 @@
-#!/bin/bash\r
-# Copyright (c) 2018 Intel Corporation.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-DIRNAME=`dirname $0`\r
-DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`\r
-echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"\r
-cd ${DOCKER_BUILD_DIR}\r
-\r
-BUILD_ARGS="--no-cache"\r
-ORG="onap"\r
-VERSION="1.3.0-SNAPSHOT"\r
-STAGING="1.3.0-STAGING"\r
-PROJECT="multicloud"\r
-IMAGE="openstack-lenovo"\r
-DOCKER_REPOSITORY="nexus3.onap.org:10003"\r
-IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"\r
-\r
-if [ $HTTP_PROXY ]; then\r
-    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"\r
-fi\r
-if [ $HTTPS_PROXY ]; then\r
-    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"\r
-fi\r
-\r
-function build_image {\r
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .\r
-}\r
-\r
-function push_image {\r
-    docker push ${IMAGE_NAME}:${VERSION}\r
-    docker push ${IMAGE_NAME}:latest\r
-    docker push ${IMAGE_NAME}:${STAGING}\r
-}\r
-\r
-build_image\r
-push_image\r
+#!/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 2420d2d..e5da37c 100755 (executable)
--- a/lenovo/run.sh
+++ b/lenovo/run.sh
@@ -1,30 +1,30 @@
-#!/bin/bash\r
-# Copyright (c) 2017-2018 Lenovo Systems, Inc.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid\r
-export PYTHONPATH=lib/share\r
-\r
-#nohup python manage.py runserver 0.0.0.0:9010 2>&1 &\r
-nohup uwsgi --http :9010 --module thinkcloud.wsgi --master --processes 4 &\r
-\r
-logDir="/var/log/onap/multicloud/openstack/lenovo"\r
-if [ ! -x  $logDir  ]; then\r
-       mkdir -p $logDir\r
-fi\r
-while [ ! -f $logDir/thinkcloud.log ]; do\r
-    sleep 1\r
-done\r
-\r
+#!/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