fix: only invoke a shell for docker commands known to cause problems …

…on macos
anacierdem · Oct 20, 2024 · bc88f2e · bc88f2e
1 parent faabaa4
commit bc88f2e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/modules/actions/exec.js b/modules/actions/exec.js
@@ -112,6 +112,10 @@ const exec = async (info) => {
           // spawnProcess defaults does not apply to dockerExec so we need to
           // provide these explicitly here.
           inheritStderr: true,
+          spawnOptions: {
+            ...opts.spawnOptions,
+            shell: true,
+          },
           ...opts,
         }
       )

diff --git a/modules/actions/start.js b/modules/actions/start.js
@@ -58,7 +58,16 @@ const initContainer = async (libdragonInfo) => {
         '-R',
         `${uid >= 0 ? uid : ''}:${gid >= 0 ? gid : ''}`,
         '/n64_toolchain',
-      ]
+      ],
+      {
+        userCommand: false,
+        inheritStdin: true,
+        inheritStdout: false,
+        inheritStderr: false,
+        spawnOptions: {
+          shell: true,
+        },
+      }
     );
   } catch (e) {
     // Dispose the invalid container, clean and exit

diff --git a/modules/helpers.js b/modules/helpers.js
@@ -188,7 +188,6 @@ function spawnProcess(
         // Prevent the annoying docker "What's next?" message. It messes up everything.
         DOCKER_CLI_HINTS: 'false',
       },
-      shell: true,
       ...spawnOptions,
     });
 

diff --git a/modules/utils.js b/modules/utils.js
@@ -40,7 +40,16 @@ const installDependencies = async (libdragonInfo) => {
       CONTAINER_TARGET_PATH + '/' + libdragonInfo.vendorDirectory,
       ...dockerHostUserParams(libdragonInfo),
     ],
-    ['/bin/bash', './build.sh']
+    ['/bin/bash', './build.sh'],
+    {
+      userCommand: false,
+      inheritStdin: true,
+      inheritStdout: false,
+      inheritStderr: false,
+      spawnOptions: {
+        shell: true,
+      },
+    }
   );
 };