From 7e8c0a5b87610201e3ff809632cb17f439b9a8a5 Mon Sep 17 00:00:00 2001 From: Rajesh Babu Mugunthu Maheswaran Date: Tue, 6 Feb 2018 00:33:16 -0800 Subject: [PATCH 1/6] build in container --- Dockerfile.build | 7 ++++++- docker_build_script.sh | 5 ++++- makefile | 13 +++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) mode change 100644 => 100755 docker_build_script.sh create mode 100644 makefile diff --git a/Dockerfile.build b/Dockerfile.build index b449f4d..13d2233 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,6 +1,11 @@ FROM registry.mv.nuagenetworks.net:5000/build/golang:1.9 -RUN yum install -y rpm-build &&\ +RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo &&\ + yum install -y rpm-build \ + yum-utils \ + device-mapper-persistent-data \ + lvm2 \ + docker-ce &&\ mkdir -p /BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork WORKDIR /BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork diff --git a/docker_build_script.sh b/docker_build_script.sh old mode 100644 new mode 100755 index abe5714..2a95a54 --- a/docker_build_script.sh +++ b/docker_build_script.sh @@ -6,6 +6,9 @@ USER_ID=$(id -u) GROUP_ID=$(id -g) DOCKERFILE="Dockerfile.build" PWD=$(pwd) + +MAKE_TARGET=${1} + docker run --privileged \ --rm \ -e NUAGE_PROJECT=${NUAGE_PROJECT} \ @@ -19,4 +22,4 @@ docker run --privileged \ -v /usr/global:/usr/global \ -v /root:/root \ registry.mv.nuagenetworks.net:5000/build/nuage-libnetwork \ - sh scripts/buildRPM.sh + make ${MAKE_TARGET} diff --git a/makefile b/makefile new file mode 100644 index 0000000..c7212ac --- /dev/null +++ b/makefile @@ -0,0 +1,13 @@ +all: build_docker_image run_container +build_all: build_nuage_libnetwork + +build_docker_image: + docker build -t registry.mv.nuagenetworks.net:5000/build/nuage-libnetwork -f Dockerfile.build . + +run_container: + ./docker_build_script.sh build_nuage_libnetwork + +build_nuage_libnetwork: + ./scripts/buildRPM.sh + ./scripts/create-docker-image.sh + ./scripts/create-v2-plugin.sh From ff985097ed79222bb2dc3c8cda6b9b1e7c36f4d1 Mon Sep 17 00:00:00 2001 From: Rajesh Babu Mugunthu Maheswaran Date: Tue, 6 Feb 2018 00:41:12 -0800 Subject: [PATCH 2/6] fix --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index c7212ac..aff3f19 100644 --- a/makefile +++ b/makefile @@ -5,9 +5,9 @@ build_docker_image: docker build -t registry.mv.nuagenetworks.net:5000/build/nuage-libnetwork -f Dockerfile.build . run_container: - ./docker_build_script.sh build_nuage_libnetwork + ./docker_build_script.sh build_all build_nuage_libnetwork: ./scripts/buildRPM.sh ./scripts/create-docker-image.sh - ./scripts/create-v2-plugin.sh + yes | ./scripts/create-v2-plugin.sh registry.mv.nuagenetworks.net:5000/nuage-plugin:latest From e23b1f577caa0e9f28368486780efa0457c4e1fe Mon Sep 17 00:00:00 2001 From: Rajesh Babu Mugunthu Maheswaran Date: Tue, 6 Feb 2018 00:57:40 -0800 Subject: [PATCH 3/6] install Development Tools --- Dockerfile.build | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.build b/Dockerfile.build index 13d2233..562c45a 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -6,6 +6,7 @@ RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docke device-mapper-persistent-data \ lvm2 \ docker-ce &&\ + yum groupinstall -y "Development Tools" &&\ mkdir -p /BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork WORKDIR /BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork From 8dee460624d5dc77d9da2827b14a21469fa3c60b Mon Sep 17 00:00:00 2001 From: Rajesh Babu Mugunthu Maheswaran Date: Tue, 6 Feb 2018 01:04:15 -0800 Subject: [PATCH 4/6] mount Docker socket --- docker_build_script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker_build_script.sh b/docker_build_script.sh index 2a95a54..e551860 100755 --- a/docker_build_script.sh +++ b/docker_build_script.sh @@ -21,5 +21,6 @@ docker run --privileged \ -v ${PWD}:/BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork \ -v /usr/global:/usr/global \ -v /root:/root \ + -v /var/run/docker.sock:/var/run/docker.sock \ registry.mv.nuagenetworks.net:5000/build/nuage-libnetwork \ make ${MAKE_TARGET} From 3550e6dfb1bd7b78a1f81dd7edf136aba7f13d6c Mon Sep 17 00:00:00 2001 From: Rajesh Babu Mugunthu Maheswaran Date: Tue, 6 Feb 2018 01:22:37 -0800 Subject: [PATCH 5/6] install make --- Dockerfile.build | 3 ++- scripts/create-docker-image.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 562c45a..9fd3e3b 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -5,7 +5,8 @@ RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docke yum-utils \ device-mapper-persistent-data \ lvm2 \ - docker-ce &&\ + docker-ce \ + make &&\ yum groupinstall -y "Development Tools" &&\ mkdir -p /BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork diff --git a/scripts/create-docker-image.sh b/scripts/create-docker-image.sh index ae85186..60cc810 100755 --- a/scripts/create-docker-image.sh +++ b/scripts/create-docker-image.sh @@ -12,7 +12,7 @@ if [ -z ${version} ]; then exit 1 fi -#go build +go build docker build -t nuage-plugin:${version} -f Dockerfile . From 138c10ce58b936e26776fc9bdd6ce25db744cb8a Mon Sep 17 00:00:00 2001 From: Rajesh Babu Mugunthu Maheswaran Date: Tue, 6 Feb 2018 01:26:58 -0800 Subject: [PATCH 6/6] install sudo --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index 9fd3e3b..d552872 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -6,7 +6,7 @@ RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docke device-mapper-persistent-data \ lvm2 \ docker-ce \ - make &&\ + sudo &&\ yum groupinstall -y "Development Tools" &&\ mkdir -p /BUILD/go/src/github.com/nuagenetworks/nuage-libnetwork