mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ea86320fcc
This fix tries to address issues related to #23221 where Dockerignore may consists of UTF-8 BOM. This likely happens when Notepad tries to save a file as UTF-8 in Windows. This fix skips the UTF-8 BOM bytes from the beginning of the Dockerignore if exists. Additional tests has been added to cover the changes in this fix. This fix is related to #23221 (UTF-8 BOM in Dockerfile). Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
49 lines
1.2 KiB
Go
49 lines
1.2 KiB
Go
package dockerignore
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
// ReadAll reads a .dockerignore file and returns the list of file patterns
|
|
// to ignore. Note this will trim whitespace from each line as well
|
|
// as use GO's "clean" func to get the shortest/cleanest path for each.
|
|
func ReadAll(reader io.ReadCloser) ([]string, error) {
|
|
if reader == nil {
|
|
return nil, nil
|
|
}
|
|
defer reader.Close()
|
|
scanner := bufio.NewScanner(reader)
|
|
var excludes []string
|
|
currentLine := 0
|
|
|
|
utf8bom := []byte{0xEF, 0xBB, 0xBF}
|
|
for scanner.Scan() {
|
|
scannedBytes := scanner.Bytes()
|
|
// We trim UTF8 BOM
|
|
if currentLine == 0 {
|
|
scannedBytes = bytes.TrimPrefix(scannedBytes, utf8bom)
|
|
}
|
|
pattern := string(scannedBytes)
|
|
currentLine++
|
|
// Lines starting with # (comments) are ignored before processing
|
|
if strings.HasPrefix(pattern, "#") {
|
|
continue
|
|
}
|
|
pattern = strings.TrimSpace(pattern)
|
|
if pattern == "" {
|
|
continue
|
|
}
|
|
pattern = filepath.Clean(pattern)
|
|
pattern = filepath.ToSlash(pattern)
|
|
excludes = append(excludes, pattern)
|
|
}
|
|
if err := scanner.Err(); err != nil {
|
|
return nil, fmt.Errorf("Error reading .dockerignore: %v", err)
|
|
}
|
|
return excludes, nil
|
|
}
|