Skip to content

Commit

Permalink
Mount .gitconfig to build container (#109)
Browse files Browse the repository at this point in the history
This is so that tools inside the container can push code up
to github.
  • Loading branch information
doug-stratoscale authored Oct 2, 2018
1 parent e39c905 commit 87077a1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions skipper/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 6 additions & 0 deletions tests/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit 87077a1

Please sign in to comment.