From 6c7e3a2453dcb88661229ba8d83f6d633a8f0e27 Mon Sep 17 00:00:00 2001
From: Irina <ib565x@intl.att.com>
Date: Wed, 22 Apr 2020 17:33:47 +0300
Subject: [PATCH] Ronit changes

Change-Id: Idc26bde7827b529f8d7c347d5393a2636210ace0
Signed-off-by: Irina <ib565x@intl.att.com>
---
 ci/Dockerfile => Dockerfile | 11 +++--------
 ci/build.sh                 | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)
 rename ci/Dockerfile => Dockerfile (81%)
 mode change 100755 => 100644

diff --git a/ci/Dockerfile b/Dockerfile
old mode 100755
new mode 100644
similarity index 81%
rename from ci/Dockerfile
rename to Dockerfile
index 92172eb..2ce805e
--- a/ci/Dockerfile
+++ b/Dockerfile
@@ -14,24 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# CI to verify the RMR library and build run-time and dev packages
-# Inherits C toolchain from buildpack-deps:stretch
-# Adds cmake ksh and alien for RMR
-
-FROM buildpack-deps:stretch
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ubuntu
 RUN apt-get update && apt-get -q -y install cmake ksh alien
 ADD . /tmp
 WORKDIR /tmp
 
-# build RMr, run unit tests, and generate packages and package lists
+# build rnib and generate package
 RUN sh ci/build.sh
 
 # Executing the container "as a binary" will cause the CI publish
 # script to execute.  This will take the simple package list generated
 # by the ci_build script and copy the list of packages to the target
 # directory.  The target directory is /export by default, but can be
-# overridden from the docker run command line. In either case, the 
+# overridden from the docker run command line. In either case, the
 # assumption is that the target directory is mounted as a volume.
 #
 ENTRYPOINT [ "ci/publish.sh" ]
-
diff --git a/ci/build.sh b/ci/build.sh
index f9fb81d..3e47336 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -15,12 +15,12 @@ target_dir="packages"
 project_name="rnib"
 if [ ! -d $target_dir ]
 then
-	echo "$target_dir will be created"
+    echo "$target_dir will be created"
     if ! mkdir -p $target_dir
-	then
-		echo "[FAIL] cannot find or create target directory: $target_dir"
-		exit 1
-	fi
+    then
+        echo "[FAIL] cannot find or create target directory: $target_dir"
+        exit 1
+    fi
 fi
     rm -f ./$target_dir/*.*
     mkdir -p $target_dir/DEBIAN
@@ -28,14 +28,18 @@ fi
     echo "cp -f -r ./creader/$output_dir/* $target_dir/usr/local/include/$project_name"
     cp -f -r ./creader/$output_dir/* $target_dir/usr/local/include/$project_name
     cp ./ci/control $target_dir/DEBIAN
-    
+
      ver=$(cat ./ci/package-tag.yaml | grep tag: |awk '{split($0,ver,":"); print ver[2]}'| tr -d " \t\n\r")
-     echo $project_name 
+     echo $project_name
      new_name=${project_name}_$ver
      echo $new_names
      dpkg-deb --build $target_dir
-     echo "mv *.deb $new_name.deb"
-     mv *.deb $new_name.deb
+
+     mkdir -p exported
+
+     ls -la
+     echo "mv *.deb ./exported/$new_name.deb"
+     mv *.deb ./exported/$new_name.deb
      echo "deb package is: $project_name_$ver.deb"
+    cd ./exported
     ls -al *.deb
-    
\ No newline at end of file
-- 
2.16.6