From 7635e38ddef168eefade1b4e9f7eb45e5d36595e Mon Sep 17 00:00:00 2001 From: Lukas Peleska Date: Thu, 11 Feb 2016 18:29:03 +0100 Subject: [PATCH] Use sh instead of bash for docker executor Some images are missing the bash shell, for example the alpine linux image, which is now the default base image for docker --- executors/docker/executor_docker_command.go | 2 +- executors/docker/executor_docker_ssh.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/executors/docker/executor_docker_command.go b/executors/docker/executor_docker_command.go index 1d31800314..8ec39b937a 100644 --- a/executors/docker/executor_docker_command.go +++ b/executors/docker/executor_docker_command.go @@ -86,7 +86,7 @@ func init() { DefaultCacheDir: "/cache", SharedBuildsDir: false, Shell: common.ShellScriptInfo{ - Shell: "bash", + Shell: "sh", Type: common.NormalShell, RunnerCommand: "/usr/bin/gitlab-runner-helper", }, diff --git a/executors/docker/executor_docker_ssh.go b/executors/docker/executor_docker_ssh.go index 4ec407f2bf..e4336e7c82 100644 --- a/executors/docker/executor_docker_ssh.go +++ b/executors/docker/executor_docker_ssh.go @@ -84,7 +84,7 @@ func init() { DefaultBuildsDir: "builds", SharedBuildsDir: false, Shell: common.ShellScriptInfo{ - Shell: "bash", + Shell: "sh", Type: common.LoginShell, }, ShowHostname: true, -- GitLab