Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix env corruption in docker run command #92

Merged
merged 6 commits into from
Dec 30, 2024
Merged

Fix env corruption in docker run command #92

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5463755
Dont use ulimit in docker extra args
arjunsuresh Dec 29, 2024
5f76439
CM_MLPERF_PERFORMANCE_SAMPLE_COUNT -> CM_MLPERF_LOADGEN_PERFORMANCE_S…
arjunsuresh Dec 29, 2024
cabe2a5
Merge branch 'dev' into dev
arjunsuresh Dec 29, 2024
fe1d01b
Fix env corruption in docker run command, fixes #91
arjunsuresh Dec 30, 2024
4c158f4
Merge branch 'dev' into dev
arjunsuresh Dec 30, 2024
ecd1164
Fix env corruption in docker run command, fixes #91
arjunsuresh Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions automation/script/module_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,7 +2172,7 @@ def docker(i):

# env keys corresponding to container mounts are explicitly passed to
# the container run cmd
container_env_string = ''
container_env = {}
for index in range(len(mounts)):
mount = mounts[index]
# Since windows may have 2 :, we search from the right
Expand Down Expand Up @@ -2214,7 +2214,6 @@ def docker(i):
new_container_mount, new_container_mount_env = get_container_path(
env[tmp_value])
container_env_key = new_container_mount_env
# container_env_string += " --env.{}={} ".format(tmp_value, new_container_mount_env)
else: # we skip those mounts
mounts[index] = None
skip = True
Expand All @@ -2226,8 +2225,7 @@ def docker(i):
continue
mounts[index] = new_host_mount + ":" + new_container_mount
if host_env_key:
container_env_string += " --env.{}={} ".format(
host_env_key, container_env_key)
container_env[host_env_key] = container_env_key

for v in docker_input_mapping:
if docker_input_mapping[v] == host_env_key:
Expand Down Expand Up @@ -2258,10 +2256,16 @@ def docker(i):
for key in proxy_keys:
if os.environ.get(key, '') != '':
value = os.environ[key]
container_env_string += " --env.{}={} ".format(key, value)
container_env[key] = value
env['+ CM_DOCKER_BUILD_ARGS'].append(
"{}={}".format(key, value))

if container_env:
if not i_run_cmd.get('env'):
i_run_cmd['env'] = container_env
else:
i_run_cmd['env'] = {**i_run_cmd['env'], **container_env}

docker_use_host_group_id = i.get(
'docker_use_host_group_id',
docker_settings.get('use_host_group_id'))
Expand Down Expand Up @@ -2403,8 +2407,7 @@ def docker(i):
'docker_run_cmd_prefix': i.get('docker_run_cmd_prefix', '')})
if r['return'] > 0:
return r
run_cmd = r['run_cmd_string'] + ' ' + \
container_env_string + ' --docker_run_deps '
run_cmd = r['run_cmd_string'] + ' ' + ' --docker_run_deps '

env['CM_RUN_STATE_DOCKER'] = True

Expand Down
Loading