Merge pull request #11296 from chadlwilson/minor-docker-image-fixes

Improve docker image logging
gocd · Feb 11, 2023 · 28f9b7b · 28f9b7b
2 parents 556ac10 + d8cfbdf
commit 28f9b7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/buildSrc/src/main/groovy/com/thoughtworks/go/build/docker/Distro.groovy b/buildSrc/src/main/groovy/com/thoughtworks/go/build/docker/Distro.groovy
@@ -105,6 +105,7 @@ enum Distro implements DistroBehavior {
       def pkg = v.lessThan(8) ? 'yum' : 'dnf'
       def commands = [
         "echo 'fastestmirror=1' >> /etc/${pkg == 'yum' ? 'yum' : 'dnf/dnf'}.conf",
+        "echo 'install_weak_deps=False' >> /etc/${pkg == 'yum' ? 'yum' : 'dnf/dnf'}.conf",
         "${pkg} update -y",
         "${pkg} upgrade -y",
       ]
@@ -120,8 +121,7 @@ enum Distro implements DistroBehavior {
 
       commands += [
         "${pkg} clean all",
-        "rm -rf /var/cache/${pkg}",
-        "sed -i -e s/fastestmirror=1//g /etc/${pkg == 'yum' ? 'yum' : 'dnf/dnf'}.conf",
+        "rm -rf /var/cache/${pkg}"
       ]
 
       return commands

diff --git a/installers/generic.gradle b/installers/generic.gradle
@@ -146,7 +146,8 @@ def configureGenericZip(Zip zipTask, InstallerType installerType) {
           def newLines = [
             '#encoding=UTF-8',
             'wrapper.working.dir=..',
-            'wrapper.disable_console_input=TRUE'
+            'wrapper.disable_console_input=TRUE',
+            'wrapper.console.flush=TRUE'
           ]
 
           installerType.additionalEnvVars.forEach { k, v ->

diff --git a/installers/linux.gradle b/installers/linux.gradle
@@ -205,7 +205,8 @@ def configureLinuxPackage(DefaultTask packageTask, InstallerType installerType,
               def newLines = [
                 '#encoding=UTF-8',
                 "wrapper.working.dir=/var/lib/${installerType.baseName}",
-                'wrapper.disable_console_input=TRUE'
+                'wrapper.disable_console_input=TRUE',
+                'wrapper.console.flush=TRUE'
               ]
 
               (installerType.additionalEnvVars + installerType.additionalLinuxEnvVars).forEach { k, v ->