Skip to content

Commit

Permalink
remove utils_chown container
Browse files Browse the repository at this point in the history
  • Loading branch information
JordiSubira committed Jan 10, 2024
1 parent 6f8ec87 commit f641bd3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 26 deletions.
5 changes: 0 additions & 5 deletions tools/topology/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,6 @@ def _dispatcher_conf(self, topo_id, topo, base):
'networks': {},
'user': self.user,
'volumes': [],
'depends_on': {
'utils_chowner': {
'condition': 'service_started'
},
},
}
keys = list(topo.get("control_service", {}))
if topo.get("test_dispatcher"):
Expand Down
16 changes: 0 additions & 16 deletions tools/topology/docker_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,12 @@ def __init__(self, args):
self.output_base = os.environ.get('SCION_OUTPUT_BASE', os.getcwd())

def generate(self):
self._utils_conf()
for topo_id in self.args.topo_dicts:
self._test_conf(topo_id)
if self.args.sig:
self._sig_testing_conf()
return self.dc_conf

# TODO(JordiSubira): Remove container if not needed
def _utils_conf(self):
entry_chown = {
'image': 'busybox',
'network_mode': 'none',
'volumes': [
'/etc/passwd:/etc/passwd:ro',
'/etc/group:/etc/group:ro'
],
'command': 'echo hello'
}
for volume in self.dc_conf['volumes']:
entry_chown['volumes'].append('%s:/mnt/volumes/%s' % (volume, volume))
self.dc_conf['services']['utils_chowner'] = entry_chown

def _test_conf(self, topo_id):
cntr_base = '/share'
name = 'tester_%s' % topo_id.file_fmt()
Expand Down
5 changes: 0 additions & 5 deletions tools/topology/sig.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ def _dispatcher_conf(self, topo_id, base):
'dispatcher',
'container_name':
'scion_%sdisp_sig_%s' % (self.prefix, topo_id.file_fmt()),
'depends_on': {
'utils_chowner': {
'condition': 'service_started'
},
},
'user':
self.user,
'networks': {},
Expand Down

0 comments on commit f641bd3

Please sign in to comment.