Skip to content

Commit

Permalink
Merge pull request openshift#485 from cgwalters/readme-more-quotes
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed May 4, 2016
2 parents 528d0e9 fcac816 commit 95d932a
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 75,22 @@ And the `*/*/temp*` rule prevents the filtering of any files starting with `temp
Next, to illustrate exception rules, first consider the following example snippet of a `.s2iignore` file:


*.md
!README.md
```
*.md
!README.md
```


With this exception rule example, README.md will not be filtered, and remain in the image s2i produces. However, with this snippet:


!README.md
*.md
```
!README.md
*.md
```


README.md, if filtered by any prior rules, but then put back in by `!README.md`, would be filtered, and not part of the resulting image s2i produces. Since `*.md` follows `!README.md`, `*.md` takes precedence.
`README.md`, if filtered by any prior rules, but then put back in by `!README.md`, would be filtered, and not part of the resulting image s2i produces. Since `*.md` follows `!README.md`, `*.md` takes precedence.

Users can also set extra environment variables in the application source code.
They are passed to the build, and the `assemble` script consumes them. All
Expand Down

0 comments on commit 95d932a

Please sign in to comment.