[infra] Prevent mounting local checkout to $SRC + clean up Dockerfiles (#1699). #1700
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Seems to work locally, so I'm landing for now. Oliver, please take a look whether you're fine with this change. |
oliverchang
reviewed
Aug 10, 2018
| WORKDIR_REGEX = re.compile(r'\s*WORKDIR\s*([^\s]+)') | ||
| def _workdir_from_dockerfile(project_name): | ||
| """Parse WORKDIR from the Dockerfile for the given project.""" | ||
| WORKDIR_REGEX = re.compile(r'\s*WORKDIR\s*(\$SRC/[^\s]+)') |
There was a problem hiding this comment.
why is the addition of $SRC needed in the regex? There are lots of Dockerfiles without $SRC in their WORKDIR command.
There was a problem hiding this comment.
I thought it would be an elegant way to avoid WORKDIR $SRC cases, but you're right, I also avoid WORKDIR project now.
There was a problem hiding this comment.
For example this is wrong:
>>> import helper
>>> helper._workdir_from_dockerfile('firefox')
'/src/firefox'
Should be:
'/src/mozilla-central'
There was a problem hiding this comment.
Yeah :( let me upload another fix.
tmatth
pushed a commit
to tmatth/oss-fuzz
that referenced
this pull request
Oct 22, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.