Skip to content

Removed hard-coded value from docker.py #106

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

Merged
qiluo-msft merged 2 commits into from
Feb 24, 2017
Merged

Removed hard-coded value from docker.py #106

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0b8b1
Fix failure of deployment on docker container. Verified on HW as well.
pkandrin Jan 30, 2017
0824c4d
Added root user's home directory to condition for collecting temporar…
pkandrin Feb 10, 2017
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
2 changes: 1 addition & 1 deletion ansible/shell_plugins/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def join_path(self, *args):
## We observe the interactions between ShellModule and ActionModule, and
## find the temporary directories Ansible created on remote machine. So we
## collect them and copied to docker container in build_module_command
if len(args) >= 2 and args[0].startswith('/home/') and args[1] == '':
if len(args) >= 2 and args[1] == '':
Copy link
Copy Markdown
Contributor

@qiluo-msft qiluo-msft Feb 3, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it true that you customize the home directory on 'some systems'? If yes, instead of removing the condition, could you find the accurate "home" directory and keep the condition?

Copy link
Copy Markdown
Contributor Author

@pkandrin pkandrin Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to deploy on the system with only root user. The "home" directory for root user is "/root/" so this condition always fails. I'll update this pull request today to keep condition for root user too.

self.dtemps.append(args[0])

return super(ShellModule, self).join_path(*args)
Expand Down