-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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.
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
update docker stuff #8689
update docker stuff #8689
Conversation
metasploit-framework.gemspec
Outdated
if File.directory?(File.join(File.dirname(__FILE__), ".git")) | ||
# only do a git ls-files if the .git folder exists and we have a git binary in PATH | ||
if File.directory?(File.join(File.dirname(__FILE__), ".git")) && | ||
ENV['PATH'].split(':').collect {|d| Dir.entries d if Dir.exists? d}.flatten.include?("git") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like we're missing some Windows corner cases per https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby but I doubt people are building the metasploit gem from a stock Windows environment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@busterb I pushed some changes can you please take a look again?
Thanks, looks good to me. |
@@ -0,0 +1,21 @@ | |||
# -*- coding: binary -*- |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice, thanks for splitting this out.
Release NotesThe usability of Metasploit in Docker containers has been improved. |
This PR changes the following:
*-dev
binstub the local directory including the.git
dir is added so we hit this if branch and ruby tries to execute git. This change searches thePATH
environment variable for a git binary.Error message before this change (run
MSF_BUILD=1 msfconsole-dev
):