From f291bc9211cdc6bab12f1334efebe1ce878df405 Mon Sep 17 00:00:00 2001
From: YohanPipereau <ypiperea@cisco.com>
Date: Tue, 16 Apr 2019 12:55:58 +0200
Subject: Fix docker runtime and Makefile

-Remove make test used in build-scvpp and add a test-scvpp instruction
-Remove useless build scripts for docker build
-Use sysrepo docker image to build sweetcomb docker image
-Change makefile clean instruction to avoid errors
-Do not put scripts in build-root directory but in sweetcomb root dir
-Remove sysrepo compiled in Debug mode causing error looking for symbols

Change-Id: Ie1d77f5224ad545da29c0f450403dbd47ca7c563
Signed-off-by: YohanPipereau <ypiperea@cisco.com>
---
 build-root/scripts/de_build.sh | 30 ----------------------------
 build-root/scripts/docker.sh   | 45 +++++++-----------------------------------
 2 files changed, 7 insertions(+), 68 deletions(-)
 delete mode 100755 build-root/scripts/de_build.sh

(limited to 'build-root/scripts')

diff --git a/build-root/scripts/de_build.sh b/build-root/scripts/de_build.sh
deleted file mode 100755
index 70182d3..0000000
--- a/build-root/scripts/de_build.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2019 PANTHEON.tech.
-#
-# 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.
-
-SWEETCOMB_DIR="/root/src/sweetcomb"
-
-function build_sweetcomb {
-    cd /root/src/sweetcomb
-    yes | make install-dep
-    make build-scvpp
-    make build-plugins
-}
-
-function main {
-    build_sweetcomb
-}
-
-main $@
diff --git a/build-root/scripts/docker.sh b/build-root/scripts/docker.sh
index 8ed872e..baa994c 100755
--- a/build-root/scripts/docker.sh
+++ b/build-root/scripts/docker.sh
@@ -14,45 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 IMAGE="sweetcomb_img"
 CONTAINER="sweetcomb"
 
-function build_enviroment {
-    FIND=`docker images | grep ${IMAGE}`
-
-    if [ -n "${FIND}" ]; then
-        return
-    fi
-
-    docker build -t ${IMAGE} ./src/Docker/Build
-}
-
-function create_container {
-    docker run -id --privileged --name ${CONTAINER} \
-        -v $(pwd)/../sweetcomb:/root/src/sweetcomb ${IMAGE}
-}
-
-function start_container {
-    FIND=`docker container ls -a | grep ${CONTAINER}`
-
-    if [ -z "${FIND}" ]; then
-        create_container
-    else
-        FIND=`docker container ps | grep ${CONTAINER}`
-        if [ -z "${FIND}" ]; then
-            docker start ${CONTAINER}
-        fi
-    fi
-}
-
-function build_sweetcomb {
-    docker exec -it ${CONTAINER} bash -c "/root/src/sweetcomb/build-root/scripts/de_build.sh"
-}
-
-function main {
-    build_enviroment
-    start_container
-    build_sweetcomb
-}
+#Clean previous build: container and image
+docker rm ${CONTAINER} -f
+docker rmi ${IMAGE} -f
 
-main $@
+#Rebuild image and container
+docker build -t ${IMAGE} .
+docker run -id --privileged --name ${CONTAINER} ${IMAGE}
-- 
cgit 1.2.3-korg