Skip to content

Update pip.js #356

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

Closed
wants to merge 2 commits into from
Closed

Update pip.js #356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cce139
Update pip.js
wviana Apr 15, 2019
06ddf36
Merge branch 'master' into wviana-patch-keyfile-option
wviana Apr 26, 2019
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 lib/pip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ function installRequirements(targetFolder, serverless, options) {
// Mount necessary ssh files to work with private repos
dockerCmd.push(
'-v',
`${process.env.HOME}/.ssh/id_rsa:/root/.ssh/id_rsa:z`,
`${process.env.HOME}/.ssh/${options.keyFile || 'id_rsa'}:/root/.ssh/id_rsa:z`,
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would be more flexible if keyFile was a full path to a file:

Suggested change
`${process.env.HOME}/.ssh/${options.keyFile || 'id_rsa'}:/root/.ssh/id_rsa:z`,
options.keyFile ? `${options.keyFile}:/root/.ssh/id_rsa:z`: `${process.env.HOME}/.ssh/id_rsa:/root/.ssh/id_rsa:z`,

Copy link
Author

@wviana wviana May 2, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Or maybe search on absolute path. then current path, then .ssh.
What do you think?
Too much complex?

Copy link
Contributor

Choose a reason for hiding this comment

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

if you want to implement what you suggested(with test coverage 😉) I'm cool with that. Definitely more complex tho.

'-v',
`${process.env.HOME}/.ssh/known_hosts:/root/.ssh/known_hosts:z`,
'-v',
Expand Down