diff --git a/skipper/runner.py b/skipper/runner.py index 5d597b3..7f6860d 100644 --- a/skipper/runner.py +++ b/skipper/runner.py @@ -70,6 +70,7 @@ def _run_nested(fqdn_image, environment, command, interactive, name, net, volume volumes.extend([ '%(workspace)s:%(workspace)s:rw,Z' % dict(workspace=workspace), '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=homedir), + '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=homedir), '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '/var/run/docker.sock:/var/run/docker.sock:Z', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z', diff --git a/tests/test_runner.py b/tests/test_runner.py index 578460b..6a61371 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -68,6 +68,7 @@ def test_run_simple_command_nested_network_exist(self, check_output_mock, popen_ '-e', 'SKIPPER_DOCKER_GID=978', '-v', '%(workdir)s:%(workdir)s:rw,Z' % dict(workdir=WORKDIR), '-v', '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=HOME_DIR), + '-v', '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR), '-v', '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '-v', '/var/run/docker.sock:/var/run/docker.sock:Z', '-v', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z', @@ -105,6 +106,7 @@ def test_run_simple_command_nested_network_not_exist(self, check_output_mock, po '-e', 'SKIPPER_DOCKER_GID=978', '-v', '%(workdir)s:%(workdir)s:rw,Z' % dict(workdir=WORKDIR), '-v', '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=HOME_DIR), + '-v', '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR), '-v', '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '-v', '/var/run/docker.sock:/var/run/docker.sock:Z', '-v', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z', @@ -144,6 +146,7 @@ def test_run_simple_command_nested_with_env(self, check_output_mock, popen_mock, '-e', 'SKIPPER_DOCKER_GID=978', '-v', '%(workdir)s:%(workdir)s:rw,Z' % dict(workdir=WORKDIR), '-v', '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=HOME_DIR), + '-v', '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR), '-v', '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '-v', '/var/run/docker.sock:/var/run/docker.sock:Z', '-v', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z', @@ -182,6 +185,7 @@ def test_run_simple_command_nested_interactive(self, check_output_mock, popen_mo '-e', 'SKIPPER_DOCKER_GID=978', '-v', '%(workdir)s:%(workdir)s:rw,Z' % dict(workdir=WORKDIR), '-v', '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=HOME_DIR), + '-v', '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR), '-v', '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '-v', '/var/run/docker.sock:/var/run/docker.sock:Z', '-v', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z', @@ -219,6 +223,7 @@ def test_run_complex_command_nested(self, check_output_mock, popen_mock, grp_get '-e', 'SKIPPER_DOCKER_GID=978', '-v', '%(workdir)s:%(workdir)s:rw,Z' % dict(workdir=WORKDIR), '-v', '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=HOME_DIR), + '-v', '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR), '-v', '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '-v', '/var/run/docker.sock:/var/run/docker.sock:Z', '-v', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z', @@ -258,6 +263,7 @@ def test_run_complex_command_nested_with_env(self, check_output_mock, popen_mock '-e', 'SKIPPER_DOCKER_GID=978', '-v', '%(workdir)s:%(workdir)s:rw,Z' % dict(workdir=WORKDIR), '-v', '%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=HOME_DIR), + '-v', '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR), '-v', '/var/lib/osmosis:/var/lib/osmosis:rw,Z', '-v', '/var/run/docker.sock:/var/run/docker.sock:Z', '-v', '/opt/skipper/skipper-entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:Z',