Skip to content

Commit

Permalink
fixed bug in copy
Browse files Browse the repository at this point in the history
  • Loading branch information
Priya Wadhwa committed Apr 24, 2018
1 parent 7dbc7a0 commit 9e641b4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
3 changes: 2 additions & 1 deletion integration_tests/dockerfiles/Dockerfile_test_multistage
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ FROM gcr.io/distroless/base:latest
COPY . .

FROM scratch as second
COPY --from=0 context/foo /foo
ENV foopath context/foo
COPY --from=0 $foopath context/b* /foo/

FROM gcr.io/distroless/base:latest
COPY --from=second /foo /foo2
3 changes: 2 additions & 1 deletion pkg/commands/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ func (c *CopyCommand) ExecuteCommand(config *manifest.Schema2Config) error {
}
if fi.IsDir() {
if !filepath.IsAbs(dest) {
dest = filepath.Join(cwd, dest)
// we need to add '/' to the end to indicate the destination is a directory
dest = filepath.Join(cwd, dest) + "/"
}
if err := util.CopyDir(fullPath, dest); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion pkg/dockerfile/dockerfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func Parse(b []byte) ([]instructions.Stage, error) {
return stages, err
}

// ResolveStages resolves any calls to previous stages to the number value of that stage
// ResolveStages resolves any calls to previous stages with names to indices
// Ex. --from=second_stage should be --from=1 for easier processing later on
func ResolveStages(stages []instructions.Stage) {
nameToIndex := make(map[string]string)
Expand Down
3 changes: 3 additions & 0 deletions pkg/util/fs_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ func RelativeFiles(fp string, root string) ([]string, error) {
fullPath := filepath.Join(root, fp)
logrus.Debugf("Getting files and contents at root %s", fullPath)
err := filepath.Walk(fullPath, func(path string, info os.FileInfo, err error) error {
if PathInWhitelist(path, root) {
return nil
}
if err != nil {
return err
}
Expand Down

0 comments on commit 9e641b4

Please sign in to comment.