diff --git a/docs/project/changelog.md b/docs/project/changelog.md
index 35e67dd8c..c3c8ef3d2 100644
--- a/docs/project/changelog.md
+++ b/docs/project/changelog.md
@@ -241,6 +241,8 @@ See the {ref}`0-17-0-release-notes` for more information.
   [pyodide/pyodide-env](https://hub.docker.com/repository/docker/pyodide/pyodide-env)
   and
   [pyodide/pyodide](https://hub.docker.com/repository/docker/pyodide/pyodide).
+- {{ Enhancement }} Option to run docker in non-interactive mode
+  {pr}`1641`
 
 ### REPL
 
diff --git a/run_docker b/run_docker
index 0de7ce19e..80053ec64 100755
--- a/run_docker
+++ b/run_docker
@@ -6,6 +6,7 @@ PYODIDE_PREBUILT_IMAGE_TAG="0.17.0"
 DEFAULT_PYODIDE_DOCKER_IMAGE="${PYODIDE_IMAGE_REPO}/pyodide-env:${PYODIDE_IMAGE_TAG}"
 DEFAULT_PYODIDE_SYSTEM_PORT="8000"
 DOCKER_COMMAND="/bin/bash"
+DOCKER_INTERACTIVE="--interactive"
 
 set -eo pipefail
 
@@ -24,6 +25,8 @@ Options:
   -p, --port <port>           System port to which to forward.
                               This is ignored if the env var PYODIDE_SYSTEM_PORT is set.
                               If set to 'none', docker instance will not bind to any port.
+  --non-interactive           Run docker without the --interactive flag.
+                              Useful for running in headless mode on CI server.
 
 Prerequisites:
   Docker has to be set up on your system.
@@ -62,6 +65,10 @@ do
         DEFAULT_PYODIDE_SYSTEM_PORT=$2
         shift 2
       ;;
+      --non-interactive)
+        DOCKER_INTERACTIVE="--interactive=false"
+        shift
+      ;;
       -*)
         >&2 echo "Unknown option $1"
         error
@@ -120,7 +127,7 @@ CONTAINER=$(\
 EXIT_STATUS=0
 # Execute the provided command as the host user with HOME=/src
 docker exec \
-  -it \
+  $DOCKER_INTERACTIVE --tty \
   --user $(id --user):$(id --group) \
   $CONTAINER \
   /bin/bash -c "${DOCKER_COMMAND}" || EXIT_STATUS=$?