Merge pull request #915 from kerogers-cloudbees/JENKINS-57841

Author: Vlatombe

examples/kaniko-declarative.groovy

@@ -24,8 +24,9 @@ spec:
     image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
     imagePullPolicy: Always
     command:
-    - /busybox/cat
-    tty: true
+    - sleep
+    args:
+    - 9999999
     volumeMounts:
       - name: jenkins-docker-cfg
         mountPath: /kaniko/.docker

examples/kaniko-gcr.groovy

@@ -16,8 +16,9 @@ spec:
     image: gcr.io/kaniko-project/executor:debug
     imagePullPolicy: Always
     command:
-    - /busybox/cat
-    tty: true
+    - sleep
+    args:
+    - 9999999
     volumeMounts:
       - name: kaniko-secret
         mountPath: /secret

examples/multi-container.groovy

@@ -9,12 +9,16 @@ spec:
   containers:
   - name: maven
     image: maven:3.3.9-jdk-8-alpine
-    command: ['cat']
-    tty: true
+    command:
+    - sleep
+    args:
+    - 9999999
   - name: golang
     image: golang:1.8.0
-    command: ['cat']
-    tty: true
+    command:
+    - sleep
+    args:
+    - 9999999
 """
   ) {
 

examples/openshift-home-yaml.groovy

@@ -18,8 +18,8 @@ spec:
       value: /home/jenkins
   - name: maven
     image: maven:3.6.3-jdk-8
-    command: ['cat']
-    tty: true
+    command: ['sleep']
+    args: ['9999999']
     volumeMounts:
     - name: home-volume
       mountPath: /home/jenkins

examples/selenium.groovy

@@ -10,12 +10,12 @@ spec:
   containers:
   - name: maven-firefox
     image: maven:3.3.9-jdk-8-alpine
-    command: ['cat']
-    tty: true
+    command: ['sleep']
+    args: ['9999999']
   - name: maven-chrome
     image: maven:3.3.9-jdk-8-alpine
-    command: ['cat']
-    tty: true
+    command: ['sleep']
+    args: ['9999999']
   - name: selenium-hub
     image: selenium/hub:3.4.0
   - name: selenium-chrome

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate/config.jelly

@@ -23,15 +23,15 @@
   </f:entry>
 
   <f:entry field="command" title="${%Command to run}">
-    <f:textbox default="/bin/sh -c"/>
+    <f:textbox default="sleep"/>
   </f:entry>
 
   <f:entry field="args" title="${%Arguments to pass to the command}">
-    <f:textbox default="cat"/>
+    <f:textbox default="9999999"/>
   </f:entry>
 
   <f:entry field="ttyEnabled" title="${%Allocate pseudo-TTY}">
-    <f:checkbox default="true"/>
+    <f:checkbox default="talse"/>
   </f:entry>
 
     <f:entry title="${%Environment Variables}" field="envVars" description="${%List of environment variables to set in agent pod}">

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate/help-args.html

@@ -1,2 +1,3 @@
-Arguments to pass to the command. 
-${computer.jnlpmac} and ${computer.name} are replaced with the agent secret and name respectively. 
+<p>Arguments to pass to the command.</p>
+<p><code>${computer.jnlpmac}</code> and <code>${computer.name}</code> are replaced with the agent secret and name respectively.</p>
+<p>For Windows containers the args <code>Start-Sleep 999999</code> are reasonable choices to go with <code>powershell</code>.</p>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate/help-command.html

@@ -1 +1,3 @@
-Override the image entrypoint with a different one
+<p>Override the image entrypoint with a different one.</p>
+<p>For Windows containers <code>powershell</code> is a good default.</p>
+

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/declarative.groovy

@@ -5,8 +5,8 @@ pipeline {
       containerTemplate {
         name 'maven'
         image 'maven:3.3.9-jdk-8-alpine'
-        ttyEnabled true
-        command 'cat'
+        command 'sleep'
+        args '9999999'
       }
       podRetention onFailure()
     }