- Builder image: {{build.parameters.strategy.stiStrategy.builderImage}}
+
+
{{buildConfigName}}
+
Build strategy: {{buildConfig.parameters.strategy.type}}
+
+
+ Builder image: {{buildConfig.parameters.strategy.stiStrategy.image}}
+
+
+
+ Builder image: {{buildConfig.parameters.strategy.dockerStrategy.image}}
+
+
+
+ Builder image: {{buildConfig.parameters.strategy.customStrategy.image}}
+
-
-
Source repo: {{build.parameters.source.git.uri}}
-
+
+
Source repo: {{buildConfig.parameters.source.git.uri}}
+
+
+
+
+ Output image: {{buildConfig.parameters.output.to.name}}
+
+
+
+ Output image: {{buildConfig.parameters.output.dockerImageReference}}
+
+
+
+
+
{{build.metadata.name}}
+
Created:
+
+ Status: {{build.status}}
+
+
+
+
+
+
+
+
Build strategy: {{build.parameters.strategy.type}}
+
+
+
+ Builder image: {{build.parameters.strategy.stiStrategy.image}}
+
+
+
+ Builder image: {{build.parameters.strategy.dockerStrategy.image}}
+
+
+
+ Builder image: {{build.parameters.strategy.customStrategy.image}}
+
+
+
+
+
+ Source repo: {{build.parameters.source.git.uri}}
+
+
+
+
+
+
+
+
+ Output image: {{buildConfig.parameters.output.to.name}}
+
+
+
+
+ Output image: {{build.parameters.output.dockerImageReference}}
+
+
+
+
+
+
+
+ {{buildConfigName}}
+
+
+
+
+
+
+
{{build.metadata.name}}
+
Created:
+
+ Status: {{build.status}}
+
+
+
+
+
+
+
Build strategy: {{build.parameters.strategy.type}}
+
+
+ Builder image: {{build.parameters.strategy.stiStrategy.image}}
+
+
+
+ Builder image: {{build.parameters.strategy.dockerStrategy.image}}
+
+
+
+ Builder image: {{build.parameters.strategy.customStrategy.image}}
+
+
+
+
Source repo: {{build.parameters.source.git.uri}}
+
+
+
+
+
+ Output image: {{build.parameters.output.to.name}}
+
+
+
+ Output image: {{build.parameters.output.dockerImageReference}}
+
+
-
Output image: {{build.parameters.output.imageTag}}
-
Output image registry: {{build.parameters.output.registry}}
diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
index 41b1f745391a..f6aacbfbac0a 100644
--- a/pkg/assets/bindata.go
+++ b/pkg/assets/bindata.go
@@ -13063,10 +13063,12 @@ f._watchCallbacks(a, b).fire(f._data(a, b), e.type, e.object);
}, g.prototype._watchOpOnClose = function(a, b, c) {
!c.wasClean && this._watchCallbacks(a, b).has() && this._startWatchOp(a, b, this._resourceVersion(a, b));
};
-var i = "{protocol}://{+serverUrl}{+apiPrefix}/{apiVersion}/", j = i + "watch/{type}{?q*}", k = i + "{type}{?q*}", l = i + "{type}/{id}{?q*}", m = i + "watch/namespaces/{namespace}/{type}{?q*}", n = i + "namespaces/{namespace}/{type}{?q*}", o = i + "namespaces/{namespace}/{type}/{id}{?q*}";
+var i = "{protocol}://{+serverUrl}{+apiPrefix}/{apiVersion}/", j = i + "watch/{type}{?q*}", k = i + "{type}{?q*}", l = i + "{type}/{id}{?q*}", m = i + "watch/namespaces/{namespace}/{type}{?q*}", n = i + "namespaces/{namespace}/{type}{?q*}", o = i + "namespaces/{namespace}/{type}/{id}{?q*}", p = i + "{type}/{id}/{secret}/{hookType}{?q*}";
e.openshift.version = "v1beta1", e.k8s.version = "v1beta3", e.openshift.namespacePath = !1, e.k8s.namespacePath = !0;
-var p = {
+var q = {
builds:e.openshift,
+buildConfigs:e.openshift,
+buildConfigHooks:e.openshift,
deploymentConfigs:e.openshift,
images:e.openshift,
oAuthAccessTokens:e.openshift,
@@ -13081,19 +13083,24 @@ limitranges:e.k8s
return g.prototype._urlForType = function(a, b, c, d, e) {
var f, e = e || {};
f = d ? "http:" === window.location.protocol ? "ws" :"wss" :"http:" === window.location.protocol ? "http" :"https";
-var g = e.namespace && p[a].namespacePath, h = null;
+var g = e.namespace && q[a].namespacePath, h = null;
g && (h = e.namespace, e = angular.copy(e), delete e.namespace);
-var i;
-return i = d ? g ? m :j :b ? g ? o :l :g ? n :k, URI.expand(i, {
+var i, r = {
protocol:f,
-serverUrl:p[a].hostPort,
-apiPrefix:p[a].prefix,
-apiVersion:p[a].version,
+serverUrl:q[a].hostPort,
+apiPrefix:q[a].prefix,
+apiVersion:q[a].version,
type:a,
id:b,
-namespace:h,
-q:e
-});
+namespace:h
+};
+return d ? i = g ? m :j :b ? "buildConfigHooks" == a ? (r.secret = e.secret, r.hookType = e.hookType, e = angular.copy(e), delete e.secret, delete e.hookType, i = p) :i = g ? o :l :i = g ? n :k, r.q = e, URI.expand(i, r);
+}, g.prototype.url = function(a) {
+if (a && a.type) {
+var b = angular.copy(a);
+return delete b.type, delete b.id, this._urlForType(a.type, a.id, null, !1, b).toString();
+}
+return null;
}, new g();
} ]), angular.module("openshiftConsole").provider("RedirectLoginService", function() {
var a = !0, b = "", c = "", d = "";
@@ -13477,10 +13484,15 @@ a.max[c] = a.max[c] || "";
b.unwatchAll(c);
});
} ]), angular.module("openshiftConsole").controller("BuildsController", [ "$scope", "DataService", "$filter", "LabelFilter", function(a, b, c, d) {
-a.builds = {}, a.unfilteredBuilds = {}, a.labelSuggestions = {}, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...";
+a.builds = {}, a.unfilteredBuilds = {}, a.buildConfigs = {}, a.labelSuggestions = {}, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...", a.buildsByBuildConfig = {};
var e = [];
e.push(b.watch("builds", a, function(b) {
-a.unfilteredBuilds = b.by("metadata.name"), d.addLabelSuggestionsFromResources(a.unfilteredBuilds, a.labelSuggestions), d.setLabelSuggestions(a.labelSuggestions), a.builds = d.getLabelSelector().select(a.unfilteredBuilds), a.emptyMessage = "No builds to show", f(), console.log("builds (subscribe)", a.unfilteredBuilds);
+a.unfilteredBuilds = b.by("metadata.name"), d.addLabelSuggestionsFromResources(a.unfilteredBuilds, a.labelSuggestions), d.setLabelSuggestions(a.labelSuggestions), a.builds = d.getLabelSelector().select(a.unfilteredBuilds), a.emptyMessage = "No builds to show", f(), a.buildsByBuildConfig = {}, angular.forEach(a.builds, function(b, c) {
+var d = "";
+b.metadata.labels && (d = b.metadata.labels.buildconfig || ""), a.buildsByBuildConfig[d] = a.buildsByBuildConfig[d] || {}, a.buildsByBuildConfig[d][c] = b;
+}), console.log("builds (subscribe)", a.unfilteredBuilds);
+})), e.push(b.watch("buildConfigs", a, function(b) {
+a.buildConfigs = b.by("metadata.name"), console.log("buildConfigs (subscribe)", a.buildConfigs);
}));
var f = function() {
d.getLabelSelector().isEmpty() || !$.isEmptyObject(a.builds) || $.isEmptyObject(a.unfilteredBuilds) ? delete a.alerts.builds :a.alerts.builds = {
@@ -13713,6 +13725,15 @@ $(b).tooltip();
}
}
};
+}), angular.module("openshiftConsole").directive("selectOnFocus", function() {
+return {
+restrict:"A",
+link:function(a, b) {
+$(b).focus(function() {
+$(this).select();
+});
+}
+};
}), angular.module("openshiftConsole").filter("dateRelative", function() {
return function(a) {
return moment(a).fromNow();
@@ -13757,7 +13778,17 @@ if ("OPENSHIFT_BUILD_NAME" === e[0]) return b[e[1]];
}
return null;
};
-}), angular.module("openshiftConsole").filter("hashSize", function() {
+}).filter("webhookURL", [ "DataService", function(a) {
+return function(b, c, d, e) {
+return a.url({
+type:"buildConfigHooks",
+id:b,
+namespace:e,
+secret:d,
+hookType:c
+});
+};
+} ]), angular.module("openshiftConsole").filter("hashSize", function() {
return function(a) {
return Object.keys(a).length;
};
@@ -13777,6 +13808,16 @@ case "cpu":
}
return d + ("" != e ? " " + e :"");
};
+}).filter("helpLink", function() {
+return function(a) {
+switch (a) {
+case "webhooks":
+return "http://docs.openshift.org/latest/using_openshift/builds.html#webhook-triggers";
+
+default:
+return "http://docs.openshift.org/latest/welcome/index.html";
+}
+};
});`)
func scripts_scripts_js() ([]byte, error) {
@@ -55813,25 +55854,160 @@ var _views_builds_html = []byte(`
Builds
-
+
-
-
{{build.metadata.labels.buildconfig}} ({{build.metadata.name}})
+
+
{{buildConfigName}}
+
Build strategy: {{buildConfig.parameters.strategy.type}}
+
+
+Builder image: {{buildConfig.parameters.strategy.stiStrategy.image}}
+
+
+
+Builder image: {{buildConfig.parameters.strategy.dockerStrategy.image}}
+
+
+
+Builder image: {{buildConfig.parameters.strategy.customStrategy.image}}
+
+
+
+
Source repo: {{buildConfig.parameters.source.git.uri}}
+
+
+
+
+Output image: {{buildConfig.parameters.output.to.name}}
+
+
+
+Output image: {{buildConfig.parameters.output.dockerImageReference}}
+
+
+
+
+
{{build.metadata.name}}
+
Created:
+
+Status: {{build.status}}
+
+
+
+
+
+
+
+
Build strategy: {{build.parameters.strategy.type}}
+
+
+
+Builder image: {{build.parameters.strategy.stiStrategy.image}}
+
+
+
+Builder image: {{build.parameters.strategy.dockerStrategy.image}}
+
+
+
+Builder image: {{build.parameters.strategy.customStrategy.image}}
+
+
+
+
+
+Source repo: {{build.parameters.source.git.uri}}
+
+
+
+
+
+
+
+
+Output image: {{buildConfig.parameters.output.to.name}}
+
+
+
+
+Output image: {{build.parameters.output.dockerImageReference}}
+
+
+
+
+
+
+
+{{buildConfigName}}
+
+
+
+
+
+
+
{{build.metadata.name}}
Created:
-
Status: {{build.status}}
+
+Status: {{build.status}}
+
+
+
+
+
+
Build strategy: {{build.parameters.strategy.type}}
-
-Builder image: {{build.parameters.strategy.stiStrategy.builderImage}}
+
+
+Builder image: {{build.parameters.strategy.stiStrategy.image}}
+
+
+
+Builder image: {{build.parameters.strategy.dockerStrategy.image}}
+
+
+
+Builder image: {{build.parameters.strategy.customStrategy.image}}
+
Source repo: {{build.parameters.source.git.uri}}
-
Output image: {{build.parameters.output.imageTag}}
-
Output image registry: {{build.parameters.output.registry}}
+
+
+
+Output image: {{build.parameters.output.to.name}}
+
+
+
+Output image: {{build.parameters.output.dockerImageReference}}
+
+
+