commit 4c739dbd9774c8e85bc312a3eb3d8bee77a2e90d
author Andy Bavier <andy@onlab.us> Thu Aug 18 10:28:36 2016 -0400
committer Andy Bavier <andy@onlab.us> Fri Aug 19 09:46:51 2016 -0400
tree 86c6c285fac2afac279ab24c8d8623422f8e9c54
parent 5bf4a50cdbf1e73584f5eb2b30291c11b898bfbc

Add support for Docker container build behind proxy
Add -b cord-1.0 for ONOS app builds

Change-Id: I380f7b20f04ad81b487ccc3cafe37a38360dcf00

containers/cord-apps/Dockerfile.config

diff --git a/containers/cord-apps/Dockerfile.config b/containers/cord-apps/Dockerfile.config
index 4f34178..bf6dddf 100644
--- a/containers/cord-apps/Dockerfile.config
+++ b/containers/cord-apps/Dockerfile.config
@@ -2,7 +2,7 @@
 MAINTAINER Andy Bavier <andy@onlab.us>
 
 WORKDIR /src
-RUN     git clone https://gerrit.opencord.org/p/config.git && cd config && \
+RUN     git clone -b cord-1.0 https://gerrit.opencord.org/p/config.git && cd config && \
         mvn clean install
 
 CMD bash -c "source /root/.bashrc; onos-app onos-cord-1 install /src/config/target/cord-config-*.oar && onos-app onos-cord-1 activate org.opencord.config"
\ No newline at end of file

containers/cord-apps/Dockerfile.vtn

diff --git a/containers/cord-apps/Dockerfile.vtn b/containers/cord-apps/Dockerfile.vtn
index 6132284..544c88f 100644
--- a/containers/cord-apps/Dockerfile.vtn
+++ b/containers/cord-apps/Dockerfile.vtn
@@ -2,7 +2,7 @@
 MAINTAINER Andy Bavier <andy@onlab.us>
 
 WORKDIR /src
-RUN     git clone https://gerrit.opencord.org/p/vtn.git && cd vtn && \
+RUN     git clone -b cord-1.0 https://gerrit.opencord.org/p/vtn.git && cd vtn && \
         mvn clean install
 
 CMD bash -c "source /root/.bashrc; onos-app onos-cord-1 install /src/vtn/target/vtn-*.oar && onos-app onos-cord-1 activate org.opencord.vtn"

containers/cord-apps/Makefile

diff --git a/containers/cord-apps/Makefile b/containers/cord-apps/Makefile
index 191e249..76b0b87 100644
--- a/containers/cord-apps/Makefile
+++ b/containers/cord-apps/Makefile
@@ -3,11 +3,19 @@
 VTN_IMAGE_NAME:=xosproject/cord-app-vtn
 NO_DOCKER_CACHE?=false
 
+BUILD_ARGS =
+ifdef http_proxy
+BUILD_ARGS += --build-arg http_proxy=${http_proxy}
+endif
+ifdef https_proxy
+BUILD_ARGS += --build-arg https_proxy=${https_proxy}
+endif
+
 .PHONY: build
-build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
+build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} ${BUILD_ARGS} .
 
 .PHONY: config
-config: ; sudo docker build --rm -t ${CONFIG_IMAGE_NAME} -f Dockerfile.config .
+config: ; sudo docker build --rm -t ${CONFIG_IMAGE_NAME} -f Dockerfile.config ${BUILD_ARGS} .
 
 .PHONY: vtn
-vtn: ; sudo docker build --rm -t ${VTN_IMAGE_NAME} -f Dockerfile.vtn .
+vtn: ; sudo docker build --rm -t ${VTN_IMAGE_NAME} -f Dockerfile.vtn ${BUILD_ARGS} .