Move validateContextDirectory to builder package.
This feels like it's where it belongs and it makes it exported again (which is needed for libcompose that was using it before 1.10). Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
parent
fa860c86ff
commit
fc6122a947
|
@ -17,6 +17,7 @@ import (
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
|
|
||||||
"github.com/docker/docker/api"
|
"github.com/docker/docker/api"
|
||||||
|
"github.com/docker/docker/builder"
|
||||||
"github.com/docker/docker/builder/dockerignore"
|
"github.com/docker/docker/builder/dockerignore"
|
||||||
Cli "github.com/docker/docker/cli"
|
Cli "github.com/docker/docker/cli"
|
||||||
"github.com/docker/docker/opts"
|
"github.com/docker/docker/opts"
|
||||||
|
@ -143,7 +144,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := validateContextDirectory(contextDir, excludes); err != nil {
|
if err := builder.ValidateContextDirectory(contextDir, excludes); err != nil {
|
||||||
return fmt.Errorf("Error checking context: '%s'.", err)
|
return fmt.Errorf("Error checking context: '%s'.", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -281,54 +282,6 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// validateContextDirectory checks if all the contents of the directory
|
|
||||||
// can be read and returns an error if some files can't be read
|
|
||||||
// symlinks which point to non-existing files don't trigger an error
|
|
||||||
func validateContextDirectory(srcPath string, excludes []string) error {
|
|
||||||
contextRoot, err := getContextRoot(srcPath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return filepath.Walk(contextRoot, func(filePath string, f os.FileInfo, err error) error {
|
|
||||||
// skip this directory/file if it's not in the path, it won't get added to the context
|
|
||||||
if relFilePath, err := filepath.Rel(contextRoot, filePath); err != nil {
|
|
||||||
return err
|
|
||||||
} else if skip, err := fileutils.Matches(relFilePath, excludes); err != nil {
|
|
||||||
return err
|
|
||||||
} else if skip {
|
|
||||||
if f.IsDir() {
|
|
||||||
return filepath.SkipDir
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
if os.IsPermission(err) {
|
|
||||||
return fmt.Errorf("can't stat '%s'", filePath)
|
|
||||||
}
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// skip checking if symlinks point to non-existing files, such symlinks can be useful
|
|
||||||
// also skip named pipes, because they hanging on open
|
|
||||||
if f.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if !f.IsDir() {
|
|
||||||
currentFile, err := os.Open(filePath)
|
|
||||||
if err != nil && os.IsPermission(err) {
|
|
||||||
return fmt.Errorf("no permission to read from '%s'", filePath)
|
|
||||||
}
|
|
||||||
currentFile.Close()
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// validateTag checks if the given image name can be resolved.
|
// validateTag checks if the given image name can be resolved.
|
||||||
func validateTag(rawRepo string) (string, error) {
|
func validateTag(rawRepo string) (string, error) {
|
||||||
_, err := reference.ParseNamed(rawRepo)
|
_, err := reference.ParseNamed(rawRepo)
|
||||||
|
|
|
@ -0,0 +1,57 @@
|
||||||
|
package builder
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/docker/docker/pkg/fileutils"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ValidateContextDirectory checks if all the contents of the directory
|
||||||
|
// can be read and returns an error if some files can't be read
|
||||||
|
// symlinks which point to non-existing files don't trigger an error
|
||||||
|
func ValidateContextDirectory(srcPath string, excludes []string) error {
|
||||||
|
contextRoot, err := getContextRoot(srcPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return filepath.Walk(contextRoot, func(filePath string, f os.FileInfo, err error) error {
|
||||||
|
// skip this directory/file if it's not in the path, it won't get added to the context
|
||||||
|
if relFilePath, err := filepath.Rel(contextRoot, filePath); err != nil {
|
||||||
|
return err
|
||||||
|
} else if skip, err := fileutils.Matches(relFilePath, excludes); err != nil {
|
||||||
|
return err
|
||||||
|
} else if skip {
|
||||||
|
if f.IsDir() {
|
||||||
|
return filepath.SkipDir
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
if os.IsPermission(err) {
|
||||||
|
return fmt.Errorf("can't stat '%s'", filePath)
|
||||||
|
}
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// skip checking if symlinks point to non-existing files, such symlinks can be useful
|
||||||
|
// also skip named pipes, because they hanging on open
|
||||||
|
if f.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if !f.IsDir() {
|
||||||
|
currentFile, err := os.Open(filePath)
|
||||||
|
if err != nil && os.IsPermission(err) {
|
||||||
|
return fmt.Errorf("no permission to read from '%s'", filePath)
|
||||||
|
}
|
||||||
|
currentFile.Close()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
// +build !windows
|
// +build !windows
|
||||||
|
|
||||||
package client
|
package builder
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"path/filepath"
|
"path/filepath"
|
|
@ -1,6 +1,6 @@
|
||||||
// +build windows
|
// +build windows
|
||||||
|
|
||||||
package client
|
package builder
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"path/filepath"
|
"path/filepath"
|
Loading…
Reference in New Issue