Skip to content
Snippets Groups Projects
Commit 48074b9f authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Merge branch 'add_busybox_shell' into 'master'

Add busybox shell

See merge request gitlab-org/gitlab-runner!900
parents 80396350 cebd1335
No related branches found
No related tags found
No related merge requests found
...@@ -4,13 +4,14 @@ import ( ...@@ -4,13 +4,14 @@ import (
"bufio" "bufio"
"bytes" "bytes"
"fmt" "fmt"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
"io" "io"
"path" "path"
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
) )
const bashDetectShell = `if [ -x /usr/local/bin/bash ]; then const bashDetectShell = `if [ -x /usr/local/bin/bash ]; then
...@@ -25,6 +26,8 @@ elif [ -x /usr/bin/sh ]; then ...@@ -25,6 +26,8 @@ elif [ -x /usr/bin/sh ]; then
exec /usr/bin/sh $@ exec /usr/bin/sh $@
elif [ -x /bin/sh ]; then elif [ -x /bin/sh ]; then
exec /bin/sh $@ exec /bin/sh $@
elif [ -x /busybox/sh ]; then
exec /busybox/sh $@
else else
echo shell not found echo shell not found
exit 1 exit 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment