docker-library
/
official-images
mirror of https://github.com/docker-library/official-images.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix diff-pr globbing on images that do "COPY ./..." (like neo4j)

This commit is contained in:
Tianon Gravi 2019-04-09 15:37:28 -07:00
parent 145627aae8
commit 48c82ce313
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff-pr.sh
View File

@ -196,7 +196,9 @@ copy-tar() {
local globbed local globbed
# "find: warning: -path ./xxx/ will not match anything because it ends with /." # "find: warning: -path ./xxx/ will not match anything because it ends with /."
globbed=( $(cd "$dDir" && find -path "./${f%/}") ) local findGlobbedPath="${f%/}"
findGlobbedPath="${f#./}"
globbed=( $(cd "$dDir" && find -path "./$findGlobbedPath") )
if [ "${#globbed[@]}" -eq 0 ]; then if [ "${#globbed[@]}" -eq 0 ]; then
globbed=( "$f" ) globbed=( "$f" )
fi fi