From 0e5ad74ecea89ffad16b9fa00558b863e4573ed2 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Wed, 20 Sep 2017 15:48:09 +0000
Subject: fix docker push issue

Change-Id: I3b742cb43ea05175fbf4d68dc75c6ed7125a9d63
Issue-Id: MULTICLOUD-95
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 newton/docker/build-image.sh | 32 --------------------------------
 newton/docker/build_image.sh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 newton/docker/build-image.sh
 create mode 100644 newton/docker/build_image.sh

(limited to 'newton/docker')

diff --git a/newton/docker/build-image.sh b/newton/docker/build-image.sh
deleted file mode 100644
index fd8fb8cd..00000000
--- a/newton/docker/build-image.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-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="multicloud"
-IMAGE="openstack-newton"
-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 .
-}
-
-function push_image {
-    docker push ${IMAGE_NAME}:${VERSION}
-    docker push ${IMAGE_NAME}:latest
-}
-
-build_image
-push_image
diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh
new file mode 100644
index 00000000..fd8fb8cd
--- /dev/null
+++ b/newton/docker/build_image.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+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="multicloud"
+IMAGE="openstack-newton"
+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 .
+}
+
+function push_image {
+    docker push ${IMAGE_NAME}:${VERSION}
+    docker push ${IMAGE_NAME}:latest
+}
+
+build_image
+push_image
-- 
cgit 1.2.3-korg