github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2026-05-17 04:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31 from nalind/copy-file

Browse Source 
Teach "copy" to allow copying to a destination file
This commit is contained in:
Nalin Dahyabhai
2017-03-23 17:39:00 -04:00
committed by GitHub
parent 933eecf71d 8bbc3a5a9c
commit d00be0fbbd
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
add.go
View File

@@ -55,12 +55,20 @@ func (b *Builder) Add(destination string, extract bool, source ...string) error
}
dest = filepath.Join(dest, b.Workdir, destination)
}
// Make sure the destination is usable.
if fi, err := os.Stat(dest); err == nil && !fi.Mode().IsDir() {
return fmt.Errorf("%q already exists, but is not a subdirectory)", dest)
// Make sure the destination's parent directory is usable.
if fi, err := os.Stat(filepath.Dir(dest)); err == nil && !fi.Mode().IsDir() {
return fmt.Errorf("%q already exists, but is not a subdirectory)", filepath.Dir(dest))
}
if err := os.MkdirAll(dest, 0755); err != nil {
return fmt.Errorf("error ensuring directory %q exists: %v)", dest, err)
// Now look at the destination itself.
destfi, err := os.Stat(dest)
if err != nil {
if !os.IsNotExist(err) {
return fmt.Errorf("couldn't determine what %q is: %v)", dest, err)
}
destfi = nil
}
if len(source) > 1 && (destfi == nil || !destfi.Mode().IsDir()) {
return fmt.Errorf("destination %q is not a directory", dest)
}
for _, src := range source {
if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") {
@@ -71,22 +79,28 @@ func (b *Builder) Add(destination string, extract bool, source ...string) error
if err != nil {
return fmt.Errorf("error parsing URL %q: %v", src, err)
}
d := filepath.Join(dest, path.Base(url.Path))
d := dest
if destfi != nil && destfi.Mode().IsDir() {
d = filepath.Join(dest, path.Base(url.Path))
}
if err := addUrl(d, src); err != nil {
return err
}
continue
}
fi, err := os.Stat(src)
srcfi, err := os.Stat(src)
if err != nil {
return fmt.Errorf("error reading %q: %v", src, err)
}
if fi.Mode().IsDir() {
// The source is a directory, so we're creating a
// subdirectory of the destination. Create it first,
// so that we'll notice if it exists and isn't a
// subdirectory.
d := filepath.Join(dest, filepath.Base(src))
if srcfi.Mode().IsDir() {
// The source is a directory, so we're either creating
// the destination or a subdirectory of the
// destination. Try to create it first, so that we can
// detect if there's already something there.
d := dest
if destfi != nil && destfi.Mode().IsDir() {
d = filepath.Join(dest, filepath.Base(src))
}
if err := os.MkdirAll(d, 0755); err != nil {
return fmt.Errorf("error ensuring directory %q exists: %v)", dest, err)
}
@@ -100,7 +114,10 @@ func (b *Builder) Add(destination string, extract bool, source ...string) error
// This source is a file, and either it's not an
// archive, or we don't care whether or not it's an
// archive.
d := filepath.Join(dest, filepath.Base(src))
d := dest
if destfi != nil && destfi.Mode().IsDir() {
d = filepath.Join(dest, filepath.Base(src))
}
// Copy the file, preserving attributes.
logrus.Debugf("copying %q to %q", src, d)
if err := chrootarchive.CopyFileWithTar(src, d); err != nil {

12
tests/add.bats
View File

@@ -16,8 +16,11 @@ load helpers
buildah add --name=$cid --dest=/subdir ${TESTDIR}/randomfile
# Copy a file two files to a specific subdirectory
buildah add --name=$cid --dest=/other-subdir ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile
# Copy a file two files to a specific location, created as a subdirectory
buildah add --name=$cid --dest=/notthereyet-subdir ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile
# Copy a file two files to a specific location, which fails because it's not a directory.
run buildah add --name=$cid --dest=/notthereyet-subdir ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile
[ $status -ne 0 ]
run buildah add --name=$cid --dest=/randomfile ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile
[ $status -ne 0 ]
# Copy a file to a different working directory
buildah config --workingdir=/cwd --name=$cid
buildah add --name=$cid ${TESTDIR}/randomfile
@@ -35,11 +38,6 @@ load helpers
cmp ${TESTDIR}/randomfile $newroot/other-subdir/randomfile
test -s $newroot/other-subdir/other-randomfile
cmp ${TESTDIR}/other-randomfile $newroot/other-subdir/other-randomfile
test -d $newroot/notthereyet-subdir
test -s $newroot/notthereyet-subdir/randomfile
cmp ${TESTDIR}/randomfile $newroot/notthereyet-subdir/randomfile
test -s $newroot/notthereyet-subdir/other-randomfile
cmp ${TESTDIR}/other-randomfile $newroot/notthereyet-subdir/other-randomfile
test -d $newroot/cwd
test -s $newroot/cwd/randomfile
cmp ${TESTDIR}/randomfile $newroot/cwd/randomfile