Merge pull request gocd#11222 from chadlwilson/remove-wrapper-stdin

Fix issues with wrapper stalling or crashing on container starts

Author: chadlwilson

installers/generic.gradle

@@ -145,7 +145,8 @@ def configureGenericZip(Zip zipTask, InstallerType installerType) {
         if (eachLine == '#encoding=UTF-8') {
           def newLines = [
             '#encoding=UTF-8',
-            'wrapper.working.dir=..'
+            'wrapper.working.dir=..',
+            'wrapper.disable_console_input=TRUE'
           ]
 
           installerType.additionalEnvVars.forEach { k, v ->
@@ -165,10 +166,6 @@ def configureGenericZip(Zip zipTask, InstallerType installerType) {
           eachLine = newLines.join('\n')
         }
 
-        if (eachLine == 'wrapper.java.additional.auto_bits=TRUE') {
-          eachLine = 'wrapper.java.additional.auto_bits=FALSE'
-        }
-
         if (eachLine == 'wrapper.java.classpath.1=../lib/wrapper.jar') {
           eachLine = [
             'wrapper.java.classpath.1=wrapper/wrapper.jar',

installers/linux.gradle

@@ -204,7 +204,8 @@ def configureLinuxPackage(DefaultTask packageTask, InstallerType installerType,
             if (eachLine == '#encoding=UTF-8') {
               def newLines = [
                 '#encoding=UTF-8',
-                "wrapper.working.dir=/var/lib/${installerType.baseName}"
+                "wrapper.working.dir=/var/lib/${installerType.baseName}",
+                'wrapper.disable_console_input=TRUE'
               ]
 
               (installerType.additionalEnvVars + installerType.additionalLinuxEnvVars).forEach { k, v ->
@@ -227,10 +228,6 @@ def configureLinuxPackage(DefaultTask packageTask, InstallerType installerType,
               eachLine = newLines.join('\n')
             }
 
-            if (eachLine == 'wrapper.java.additional.auto_bits=TRUE') {
-              eachLine = 'wrapper.java.additional.auto_bits=FALSE'
-            }
-
             if (eachLine == 'wrapper.java.command=java') {
               eachLine = "wrapper.java.command=/usr/share/${installerType.baseName}/jre/bin/java"
             }