diff options
author | YohanPipereau <ypiperea@cisco.com> | 2019-04-16 12:55:58 +0200 |
---|---|---|
committer | Hongjun Ni <hongjun.ni@intel.com> | 2019-04-18 06:45:45 +0000 |
commit | f291bc9211cdc6bab12f1334efebe1ce878df405 (patch) | |
tree | 18fca519628a9fa249d1752593d9fceccc53a96b /build-root/scripts/docker.sh | |
parent | af67922d18631a33fca11a66a527407948051e18 (diff) |
Fix docker runtime and Makefilev19.08-rc0
-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>
Diffstat (limited to 'build-root/scripts/docker.sh')
-rwxr-xr-x | build-root/scripts/docker.sh | 45 |
1 files changed, 7 insertions, 38 deletions
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} |