| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -205,12 +205,10 @@ private void addFilesInDirectory(File directory) { | |||
| 205 | 205 | ||
| 206 | 206 | if (files.length != 0) { | |
| 207 | 207 | for (File f : files) { | |
| 208 | - if (effectiveMatchingIgnorePattern(f) == null) { | ||
| 209 | - if (f.isDirectory()) { | ||
| 210 | - addFilesInDirectory(f); | ||
| 211 | - } else { | ||
| 212 | - filesToAdd.add(f); | ||
| 213 | - } | ||
| 208 | + if (f.isDirectory()) { | ||
| 209 | + addFilesInDirectory(f); | ||
| 210 | + } else if (effectiveMatchingIgnorePattern(f) == null) { | ||
| 211 | + filesToAdd.add(f); | ||
| 214 | 212 | } | |
| 215 | 213 | } | |
| 216 | 214 | // base directory should at least contains Dockerfile, but better check | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -24,6 +24,17 @@ public String apply(File file) { | |||
| 24 | 24 | } | |
| 25 | 25 | }; | |
| 26 | 26 | ||
| 27 | + @Test | ||
| 28 | + public void ignoreAllBut() throws Exception { | ||
| 29 | + File baseDir = fileFromBuildTestResource("dockerignore/IgnoreAllBut"); | ||
| 30 | + Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir); | ||
| 31 | + Dockerfile.ScannedResult result = dockerfile.parse(); | ||
| 32 | + Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES); | ||
| 33 | + | ||
| 34 | + assertThat(filesToAdd, | ||
| 35 | + containsInAnyOrder("Dockerfile", "foo.jar")); | ||
| 36 | + } | ||
| 37 | + | ||
| 27 | 38 | @Test | |
| 28 | 39 | public void nestedDirsPatterns() throws Exception { | |
| 29 | 40 | File baseDir = fileFromBuildTestResource("dockerignore/NestedDirsDockerignore"); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,3 @@ | |||
| 1 | + * | ||
| 2 | + !Dockerfile | ||
| 3 | + !build/libs/foo.jar | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + FROM ubuntu:18.04 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + DO NOT WANT THIS IN THE DOCKER | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + foo.jar | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + FILE | ||
| Back | FazBrowse Home | New Git URL |
0 commit comments