bump(github.com/openshift/origin-web-console): d7af2d96749fe46359b3d5…

…f977131a408de8725d
openshift · Dec 9, 2016 · 79fdfb4 · 79fdfb4
1 parent 1c9d044
commit 79fdfb4
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
@@ -15140,9 +15140,15 @@ var a = function(a) {
 return _.isArray(a) ? a.join(" ") :a;
 };
 return function(b, c) {
-if (!b || !c) return null;
+if (!b) return null;
 var d, e = a(b.command), f = a(b.args);
-return e && f ? e + " " + f :e ? e :(d = a(_.get(c, "dockerImageMetadata.Config.Entrypoint") || [ "/bin/sh", "-c" ]), f ? d + " " + f :(e = a(_.get(c, "dockerImageMetadata.Config.Cmd")), e ? d + " " + e :null));
+if (e && f) return e + " " + f;
+if (e) return e;
+if (c) {
+if (d = a(_.get(c, "dockerImageMetadata.Config.Entrypoint") || [ "/bin/sh", "-c" ]), f) return d + " " + f;
+if (e = a(_.get(c, "dockerImageMetadata.Config.Cmd"))) return d + " " + e;
+}
+return f ? "<image-entrypoint> " + f :null;
 };
 }).filter("unidleTargetReplicas", [ "annotationFilter", function(a) {
 return function(b, c) {
@@ -16177,19 +16183,12 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "<div flex class=\"word-break\">\n" +
     "<span class=\"pod-template-key\">\n" +
-    "<span ng-if=\"container.command.length\">Command:</span>\n" +
-    "<span ng-if=\"!container.command.length\">Arguments:</span>\n" +
+    "Command:\n" +
     "</span>\n" +
     "<span>\n" +
     "<code class=\"command\">\n" +
-    "<span ng-repeat=\"arg in container.command\">\n" +
-    "<truncate-long-text content=\"arg\" limit=\"80\" newline-limit=\"1\" expandable=\"false\" use-word-boundary=\"false\">\n" +
+    "<truncate-long-text content=\"container | entrypoint : imagesByDockerReference[container.image]\" limit=\"80\" newline-limit=\"1\" expandable=\"true\" use-word-boundary=\"false\">\n" +
     "</truncate-long-text>\n" +
-    "</span>\n" +
-    "<span ng-repeat=\"arg in container.args\">\n" +
-    "<truncate-long-text content=\"arg\" limit=\"80\" newline-limit=\"1\" expandable=\"false\" use-word-boundary=\"false\">\n" +
-    "</truncate-long-text>\n" +
-    "</span>\n" +
     "</code>\n" +
     "</span>\n" +
     "</div>\n" +
@@ -21461,10 +21460,8 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</span>\n" +
     "<span ng-if=\"probe.exec.command\">\n" +
     "<code class=\"command\">\n" +
-    "<span ng-repeat=\"arg in probe.exec.command\">\n" +
-    "<truncate-long-text content=\"arg\" limit=\"80\" newline-limit=\"1\" expandable=\"false\" use-word-boundary=\"false\">\n" +
+    "<truncate-long-text content=\"probe.exec.command.join(' ')\" limit=\"80\" newline-limit=\"1\" expandable=\"true\" use-word-boundary=\"false\">\n" +
     "</truncate-long-text>\n" +
-    "</span>\n" +
     "</code>\n" +
     "</span>\n" +
     "<span ng-if=\"probe.tcpSocket\">\n" +