-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
COPY command #40
COPY command #40
Changes from 3 commits
21a9207
140d49d
5ebf156
de8cc1a
f4e9eeb
5ba9510
b3ec877
cc0c672
8d85fe9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
hello |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
bat |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
bat |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
baz |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
foo |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
FROM gcr.io/distroless/base | ||
COPY context/foo foo | ||
COPY context/foo /foodir/ | ||
COPY context/bar/b* bar/ | ||
COPY context/fo? /foo2 | ||
COPY context/bar/doesnotexist* context/foo hello | ||
COPY ./context/empty /empty | ||
COPY ./ dir/ | ||
COPY . newdir | ||
COPY context/bar /baz/ | ||
COPY ["context/foo", "/tmp/foo" ] | ||
COPY context/b* /baz/ | ||
COPY context/foo context/bar/ba? /test/ | ||
COPY context/arr[[]0].txt /mydir/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[ | ||
{ | ||
"Image1": "gcr.io/kbuild-test/docker-test-copy:latest", | ||
"Image2": "gcr.io/kbuild-test/kbuild-test-copy:latest", | ||
"DiffType": "File", | ||
"Diff": { | ||
"Adds": null, | ||
"Dels": null, | ||
"Mods": null | ||
} | ||
} | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* | ||
Copyright 2018 Google LLC | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package commands | ||
|
||
import ( | ||
"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||
"github.com/containers/image/manifest" | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"github.com/sirupsen/logrus" | ||
"io/ioutil" | ||
"os" | ||
"path/filepath" | ||
"strings" | ||
) | ||
|
||
type CopyCommand struct { | ||
cmd *instructions.CopyCommand | ||
buildcontext string | ||
snapshotFiles []string | ||
} | ||
|
||
func (c *CopyCommand) ExecuteCommand(config *manifest.Schema2Config) error { | ||
srcs := c.cmd.SourcesAndDest[:len(c.cmd.SourcesAndDest)-1] | ||
dest := c.cmd.SourcesAndDest[len(c.cmd.SourcesAndDest)-1] | ||
|
||
logrus.Infof("cmd: copy %s", srcs) | ||
logrus.Infof("dest: %s", dest) | ||
|
||
// Get a map of [src]:[files rooted at src] | ||
srcMap, err := util.ResolveSources(c.cmd.SourcesAndDest, c.buildcontext) | ||
if err != nil { | ||
return err | ||
} | ||
// For each source, iterate through each file within and copy it over | ||
for src, files := range srcMap { | ||
for _, file := range files { | ||
fi, err := os.Stat(filepath.Join(c.buildcontext, file)) | ||
if err != nil { | ||
return err | ||
} | ||
destPath, err := util.RelativeFilepath(file, src, dest, config.WorkingDir, c.buildcontext) | ||
if err != nil { | ||
return err | ||
} | ||
// If source file is a directory, we want to create a directory ... | ||
if fi.IsDir() { | ||
logrus.Infof("Creating directory %s", destPath) | ||
if err := os.MkdirAll(destPath, fi.Mode()); err != nil { | ||
return err | ||
} | ||
} else { | ||
// ... Else, we want to copy over a file | ||
logrus.Infof("Copying file %s to %s", file, destPath) | ||
contents, err := ioutil.ReadFile(filepath.Join(c.buildcontext, file)) | ||
if err != nil { | ||
return err | ||
} | ||
if err := util.CreateFile(destPath, contents, fi.Mode()); err != nil { | ||
return err | ||
} | ||
} | ||
// Append the destination file to the list of files that should be snapshotted later | ||
c.snapshotFiles = append(c.snapshotFiles, destPath) | ||
} | ||
} | ||
return nil | ||
} | ||
|
||
// FilesToSnapshot should return an empty array if still nil; no files were changed | ||
func (c *CopyCommand) FilesToSnapshot() []string { | ||
if c.snapshotFiles == nil { | ||
return []string{} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You might just be able to return c.snapshotFiles, for most things an empty slice is the same as nil. |
||
} | ||
return c.snapshotFiles | ||
} | ||
|
||
// CreatedBy returns some information about the command for the image config | ||
func (c *CopyCommand) CreatedBy() string { | ||
return strings.Join(c.cmd.SourcesAndDest, " ") | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
/* | ||
Copyright 2018 Google LLC | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
import ( | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"github.com/pkg/errors" | ||
"github.com/sirupsen/logrus" | ||
"os" | ||
"path/filepath" | ||
"strings" | ||
) | ||
|
||
// ContainsWildcards returns true if any entry in paths contains wildcards | ||
func ContainsWildcards(paths []string) bool { | ||
for _, path := range paths { | ||
for i := 0; i < len(path); i++ { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can probably use indexFunc here instead of a for loop: |
||
ch := path[i] | ||
// These are the wildcards that correspond to filepath.Match | ||
if ch == '*' || ch == '?' || ch == '[' { | ||
return true | ||
} | ||
} | ||
} | ||
return false | ||
} | ||
|
||
// ResolveSources resolves the given sources if the sources contains wildcards | ||
// It returns a map of [src]:[files rooted at src] | ||
func ResolveSources(srcsAndDest instructions.SourcesAndDest, root string) (map[string][]string, error) { | ||
srcs := srcsAndDest[:len(srcsAndDest)-1] | ||
// If sources contain wildcards, we first need to resolve them to actual paths | ||
if ContainsWildcards(srcs) { | ||
logrus.Debugf("Resolving srcs %v...", srcs) | ||
files, err := RelativeFiles("", root) | ||
if err != nil { | ||
return nil, err | ||
} | ||
srcs, err = matchSources(srcs, files) | ||
if err != nil { | ||
return nil, err | ||
} | ||
logrus.Debugf("Resolved sources to %v", srcs) | ||
} | ||
// Now, get a map of [src]:[files rooted at src] | ||
srcMap, err := SourcesToFilesMap(srcs, root) | ||
if err != nil { | ||
return nil, err | ||
} | ||
// Check to make sure the sources are valid | ||
return srcMap, IsSrcsValid(srcsAndDest, srcMap) | ||
} | ||
|
||
// matchSources returns a list of sources that match wildcards | ||
func matchSources(srcs, files []string) ([]string, error) { | ||
var matchedSources []string | ||
for _, src := range srcs { | ||
src = filepath.Clean(src) | ||
for _, file := range files { | ||
matched, err := filepath.Match(src, file) | ||
if err != nil { | ||
return nil, err | ||
} | ||
if matched { | ||
matchedSources = append(matchedSources, file) | ||
} | ||
} | ||
} | ||
return matchedSources, nil | ||
} | ||
|
||
func IsDestDir(path string) bool { | ||
return strings.HasSuffix(path, "/") | ||
} | ||
|
||
func IsAbsoluteFilepath(path string) bool { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
return strings.HasPrefix(path, "/") | ||
} | ||
|
||
// RelativeFilepath returns the relative filepath from the build context to the image filesystem | ||
// If source is a file: | ||
// If dest is a dir, copy it to /dest/relpath | ||
// If dest is a file, copy directly to dest | ||
// If source is a dir: | ||
// Assume dest is also a dir, and copy to dest/relpath | ||
// If dest is not an absolute filepath, add /cwd to the beginning | ||
func RelativeFilepath(filename, srcName, dest, cwd, buildcontext string) (string, error) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This name is a bit weird since it returns absolute paths right? |
||
fi, err := os.Stat(filepath.Join(buildcontext, filename)) | ||
if err != nil { | ||
return "", err | ||
} | ||
src, err := os.Stat(filepath.Join(buildcontext, srcName)) | ||
if err != nil { | ||
return "", err | ||
} | ||
if src.IsDir() || IsDestDir(dest) { | ||
relPath, err := filepath.Rel(srcName, filename) | ||
if err != nil { | ||
return "", err | ||
} | ||
if relPath == "." && !fi.IsDir() { | ||
relPath = filepath.Base(filename) | ||
} | ||
destPath := filepath.Join(dest, relPath) | ||
if IsAbsoluteFilepath(dest) { | ||
return destPath, nil | ||
} | ||
return filepath.Join(cwd, destPath), nil | ||
} | ||
if IsAbsoluteFilepath(dest) { | ||
return dest, nil | ||
} | ||
return filepath.Join(cwd, dest), nil | ||
} | ||
|
||
// SourcesToFilesMap returns a map of [src]:[files rooted at source] | ||
func SourcesToFilesMap(srcs []string, root string) (map[string][]string, error) { | ||
srcMap := make(map[string][]string) | ||
for _, src := range srcs { | ||
src = filepath.Clean(src) | ||
files, err := RelativeFiles(src, root) | ||
if err != nil { | ||
return nil, err | ||
} | ||
srcMap[src] = files | ||
} | ||
return srcMap, nil | ||
} | ||
|
||
// IsSrcsValid returns an error if the sources provided are invalid, or nil otherwise | ||
func IsSrcsValid(srcsAndDest instructions.SourcesAndDest, srcMap map[string][]string) error { | ||
srcs := srcsAndDest[:len(srcsAndDest)-1] | ||
dest := srcsAndDest[len(srcsAndDest)-1] | ||
// If destination is a directory, return nil | ||
if IsDestDir(dest) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This makes it seem like it's ok to copy no source files if the destination is a directory. Is that actually OK? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. whoops, nope, fixed! |
||
return nil | ||
} | ||
// If no wildcards and multiple sources, return error | ||
if !ContainsWildcards(srcs) { | ||
if len(srcs) > 1 { | ||
return errors.New("when specifying multiple sources in a COPY command, destination must be a directory and end in '/'") | ||
} | ||
return nil | ||
} | ||
// If there are wildcards, and the destination is a file, there must be exactly one file to copy over | ||
totalFiles := 0 | ||
for _, files := range srcMap { | ||
totalFiles += len(files) | ||
} | ||
if totalFiles == 0 { | ||
return errors.New("copy failed: no source files specified") | ||
} | ||
if totalFiles > 1 { | ||
return errors.New("when specifying multiple sources in a COPY command, destination must be a directory and end in '/'") | ||
} | ||
return nil | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The files are all local, right? You might be able to use an os.Copy, instead of buffering the file into memory then writing it back.