Skip to content
Snippets Groups Projects
Commit b87cb93a authored by jurgenhaas's avatar jurgenhaas
Browse files

#31 Resolve SSH_AUTH_SOCK only if inside a container

parent a63c3fdf
No related branches found
No related tags found
No related merge requests found
...@@ -295,7 +295,9 @@ class Handler extends BaseHandler { ...@@ -295,7 +295,9 @@ class Handler extends BaseHandler {
$ssh_auth_sock = getenv('SSH_AUTH_SOCK'); $ssh_auth_sock = getenv('SSH_AUTH_SOCK');
$options['php']['ssh'] = !empty($ssh_auth_sock); $options['php']['ssh'] = !empty($ssh_auth_sock);
if ($options['php']['ssh']) { if ($options['php']['ssh']) {
$options['php']['ssh_auth_sock'] = $this->getDockerMountSource('/ssh-agent'); $options['php']['ssh_auth_sock'] = ($this->isCiContext() || $this->isLocalDevMode()) ?
$this->getDockerMountSource('/ssh-agent') :
'$SSH_AUTH_SOCK';
} }
$options['projectroot'] = $projectRoot; $options['projectroot'] = $projectRoot;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment