Restore use of oc ex dockerbuild

smarterclayton · smarterclayton · commit f189ede42f58 · 2016-11-03T22:15:06.000-04:00
diff --git a/hack/build-base-images.sh b/hack/build-base-images.sh
@@ -12,7 +12,7 @@ if [[ -z "${oc}" ]]; then
 fi
 
 function build() {
-  eval "docker build ${OS_BUILD_IMAGE_ARGS:-} -t $1 $2"
+  eval "'${oc}' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"
 }
 
 # Build the images
diff --git a/hack/build-images.sh b/hack/build-images.sh
@@ -51,7 +51,7 @@ if [[ -z "${oc}" ]]; then
 fi
 
 function build() {
-  eval "docker build ${OS_BUILD_IMAGE_ARGS:-} -t $1 $2"
+  eval "'${oc}' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"
 }
 
 # Create link to file if the FS supports hardlinks, otherwise copy the file

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ if [[ -z "${oc}" ]]; then`
`12`	`12`	`fi`
`13`	`13`
`14`	`14`	`function build() {`
`15`		`- eval "docker build ${OS_BUILD_IMAGE_ARGS:-} -t $1 $2"`
	`15`	`+ eval "'${oc}' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`# Build the images`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ if [[ -z "${oc}" ]]; then`
`51`	`51`	`fi`
`52`	`52`
`53`	`53`	`function build() {`
`54`		`- eval "docker build ${OS_BUILD_IMAGE_ARGS:-} -t $1 $2"`
	`54`	`+ eval "'${oc}' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`# Create link to file if the FS supports hardlinks, otherwise copy the file`