Fixed integration issues

debian-package/deb-gen

@@ -2,4 +2,4 @@
 
 dpkg-deb --build --root-owner-group edge-vpnio .
 rm -f edge-vpnio/DEBIAN/control
-rm -f EdgeVPNio/tools/debian-package/edge-vpnio/DEBIAN/control
+rm -f ~/workspace/EdgeVPNio/tools/debian-package/edge-vpnio/DEBIAN/control

debian-package/debian-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-type <<! > edge-vpnio/DEBIAN/control
+cat <<! > edge-vpnio/DEBIAN/control
 Package: edge-vpnio
 Name: EdgeVPNio
 Version : 20.10.0.1604343933-dev

docker-image/evio-base.Dockerfile

@@ -19,3 +19,4 @@ RUN apt-get update -y && apt-get install -y \
 COPY ./setup-prereqs.sh .
 RUN chmod +x ./setup-prereqs.sh
 RUN ./setup-prereqs.sh
+

docker-image/evio-node.Dockerfile

@@ -1,6 +1,7 @@
 FROM edgevpnio/evio-base:1.0
 WORKDIR /root/
-COPY ./edge-vpnio_20.7_amd64.deb .
-RUN apt-get install -y ./edge-vpnio_20.7_amd64.deb && rm -rf /var/lib/apt/lists/* && apt-get autoclean
+COPY ./*.deb .
+RUN apt-get install -y ./*.deb && rm -rf /var/lib/apt/lists/* && apt-get autoclean
 
 CMD ["/sbin/init"]
+

scripts/Versioning.py

@@ -10,7 +10,7 @@ from tool_config import MAJOR_VER as mjr
 from tool_config import MINOR_VER as mnr
 from tool_config import REVISION_VER as rvn
 
-
+n = len(sys.argv)
 class Versioning:
     def changeVersionInTincan(self):
         major = mjr
@@ -96,7 +96,6 @@ class Versioning:
         filename1 = os.path.basename(src1)
         dest1 = os.path.join(location2, filename1)
         shutil.move(src1, dest1)
-        if len(sys.argv) > 1:
         os.chdir("../debian-package")
         subprocess.run("./debian-config")
         for line in fileinput.input('./edge-vpnio/DEBIAN/control', inplace=True):
@@ -110,4 +109,6 @@ class Versioning:
 
 if __name__ == '__main__':
     version = Versioning()
+
     version.changeVersionInTincan()
+

scripts/evtool-v20.7.2

@@ -32,8 +32,9 @@ function pull_src
 
 function make_debpak ()
 {
-  python3 ./scripts/Versioning.py true
+  python3 ./scripts/Versioning.py
   wd=$(pwd)
+  rm -rf ~/workspace/out/docker-image/*.deb
   cd ~/workspace
   mkdir -p out
   cd ~/workspace/$EdgeVPNIO/tools
@@ -97,13 +98,13 @@ function make_venv
 function make_dkrimg
 {
   python3 ./scripts/Versioning.py
-  mkdir -p ~/workspace/out/docker-image
   cd ~/workspace/$EdgeVPNIO/tools
+  cp -r docker-image ../../out/
   mv ../../out/debian-package/*.deb ~/workspace/out/docker-image  && \
   wd=$(pwd)
-  cd ../../out/debian-package/
+  cd ../../out/docker-image/
   NAME=`ls | grep *.deb`
-  version=$(echo $NAME | cut -d_ -f2)
+  version=$(echo "$NAME" | cut -d_ -f2)
   cd $wd
     docker build -f ./docker-image/evio-base.Dockerfile -t edgevpnio/evio-base:1.0 ../../out/docker-image && \
     docker build -f ./docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:"$version" ../../out/docker-image
@@ -260,3 +261,4 @@ case $1 in
     echo "no match on input -> $1"
     ;;
 esac
+