Merge pull request #20276 from bparees/buildfrom

openshift-merge-robot · web-flow · commit e6e672c8e9b7 · 2018-07-15T17:56:20.000-07:00
output the base/builder image that was resolved
diff --git a/hack/build-local-images.py b/hack/build-local-images.py
@@ -102,23 +102,23 @@
         "tag": "latest",
         "directory": "recycler",
         "binaries": {
-            "openshift": "/usr/bin/openshift"
+            "oc": "/usr/bin/oc"
         },
         "files": {}
     },
     "docker-builder": {
         "tag": "latest",
         "directory": "builder/docker/docker-builder",
         "binaries": {
-            "openshift": "/usr/bin/openshift"
+            "oc": "/usr/bin/oc"
         },
         "files": {}
     },
     "f5-router": {
         "tag": "latest",
         "directory": "router/f5",
         "binaries": {
-            "openshift": "/usr/bin/openshift"
+            "oc": "/usr/bin/oc"
         },
         "files": {}
     },
diff --git a/pkg/build/builder/docker.go b/pkg/build/builder/docker.go
@@ -414,6 +414,7 @@ func replaceLastFrom(node *parser.Node, image string) error {
 			if child.Next == nil {
 				child.Next = &parser.Node{}
 			}
+			glog.Infof("Replaced Dockerfile FROM image %s", child.Next.Value)
 			child.Next.Value = image
 			return nil
 		}
diff --git a/pkg/build/builder/sti.go b/pkg/build/builder/sti.go
@@ -293,6 +293,8 @@ func (s *S2IBuilder) Build() error {
 	}
 
 	glog.V(4).Infof("Starting S2I build from %s/%s BuildConfig ...", s.build.Namespace, s.build.Name)
+	glog.Infof("Using %s as the s2i builder image", s.build.Spec.Strategy.SourceStrategy.From.Name)
+
 	startTime := metav1.Now()
 	result, err := builder.Build(config)
 

Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,7 @@ func replaceLastFrom(node *parser.Node, image string) error {`
`414`	`414`	`if child.Next == nil {`
`415`	`415`	`child.Next = &parser.Node{}`
`416`	`416`	`}`
	`417`	`+ glog.Infof("Replaced Dockerfile FROM image %s", child.Next.Value)`
`417`	`418`	`child.Next.Value = image`
`418`	`419`	`return nil`
`419`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,8 @@ func (s *S2IBuilder) Build() error {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`glog.V(4).Infof("Starting S2I build from %s/%s BuildConfig ...", s.build.Namespace, s.build.Name)`
	`296`	`+ glog.Infof("Using %s as the s2i builder image", s.build.Spec.Strategy.SourceStrategy.From.Name)`
	`297`	`+`
`296`	`298`	`startTime := metav1.Now()`
`297`	`299`	`result, err := builder.Build(config)`
`298`	`300`