2015-05-13 01:21:26 +00:00
|
|
|
package daemon
|
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
"io"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2015-08-25 20:26:49 +00:00
|
|
|
"strings"
|
2015-05-13 01:21:26 +00:00
|
|
|
|
2016-01-20 23:32:02 +00:00
|
|
|
"github.com/docker/docker/builder"
|
2015-11-12 19:55:17 +00:00
|
|
|
"github.com/docker/docker/container"
|
2015-05-13 01:21:26 +00:00
|
|
|
"github.com/docker/docker/pkg/archive"
|
|
|
|
"github.com/docker/docker/pkg/chrootarchive"
|
2016-01-20 23:32:02 +00:00
|
|
|
"github.com/docker/docker/pkg/idtools"
|
2015-05-13 01:21:26 +00:00
|
|
|
"github.com/docker/docker/pkg/ioutils"
|
2016-01-05 00:05:26 +00:00
|
|
|
"github.com/docker/engine-api/types"
|
2015-05-13 01:21:26 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// ErrExtractPointNotDirectory is used to convey that the operation to extract
|
|
|
|
// a tar archive to a directory in a container has failed because the specified
|
|
|
|
// path does not refer to a directory.
|
|
|
|
var ErrExtractPointNotDirectory = errors.New("extraction point is not a directory")
|
|
|
|
|
2015-07-16 21:14:58 +00:00
|
|
|
// ContainerCopy performs a deprecated operation of archiving the resource at
|
2015-12-13 16:00:39 +00:00
|
|
|
// the specified path in the container identified by the given name.
|
2015-09-29 17:51:40 +00:00
|
|
|
func (daemon *Daemon) ContainerCopy(name string, res string) (io.ReadCloser, error) {
|
2015-12-11 17:39:28 +00:00
|
|
|
container, err := daemon.GetContainer(name)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2015-07-16 21:14:58 +00:00
|
|
|
if res[0] == '/' || res[0] == '\\' {
|
2015-05-13 01:21:26 +00:00
|
|
|
res = res[1:]
|
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
return daemon.containerCopy(container, res)
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ContainerStatPath stats the filesystem resource at the specified path in the
|
|
|
|
// container identified by the given name.
|
2015-09-29 17:51:40 +00:00
|
|
|
func (daemon *Daemon) ContainerStatPath(name string, path string) (stat *types.ContainerPathStat, err error) {
|
2015-12-11 17:39:28 +00:00
|
|
|
container, err := daemon.GetContainer(name)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
return daemon.containerStatPath(container, path)
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ContainerArchivePath creates an archive of the filesystem resource at the
|
|
|
|
// specified path in the container identified by the given name. Returns a
|
|
|
|
// tar archive of the resource and whether it was a directory or a single file.
|
2015-09-29 17:51:40 +00:00
|
|
|
func (daemon *Daemon) ContainerArchivePath(name string, path string) (content io.ReadCloser, stat *types.ContainerPathStat, err error) {
|
2015-12-11 17:39:28 +00:00
|
|
|
container, err := daemon.GetContainer(name)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
return daemon.containerArchivePath(container, path)
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ContainerExtractToDir extracts the given archive to the specified location
|
|
|
|
// in the filesystem of the container identified by the given name. The given
|
|
|
|
// path must be of a directory in the container. If it is not, the error will
|
|
|
|
// be ErrExtractPointNotDirectory. If noOverwriteDirNonDir is true then it will
|
|
|
|
// be an error if unpacking the given content would cause an existing directory
|
|
|
|
// to be replaced with a non-directory and vice versa.
|
2015-09-29 17:51:40 +00:00
|
|
|
func (daemon *Daemon) ContainerExtractToDir(name, path string, noOverwriteDirNonDir bool, content io.Reader) error {
|
2015-12-11 17:39:28 +00:00
|
|
|
container, err := daemon.GetContainer(name)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
return daemon.containerExtractToDir(container, path, noOverwriteDirNonDir, content)
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
// containerStatPath stats the filesystem resource at the specified path in this
|
2015-05-13 01:21:26 +00:00
|
|
|
// container. Returns stat info about the resource.
|
2015-11-12 19:55:17 +00:00
|
|
|
func (daemon *Daemon) containerStatPath(container *container.Container, path string) (stat *types.ContainerPathStat, err error) {
|
2015-05-13 01:21:26 +00:00
|
|
|
container.Lock()
|
|
|
|
defer container.Unlock()
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
if err = daemon.Mount(container); err != nil {
|
2015-05-13 01:21:26 +00:00
|
|
|
return nil, err
|
|
|
|
}
|
2015-11-03 01:06:09 +00:00
|
|
|
defer daemon.Unmount(container)
|
2015-05-13 01:21:26 +00:00
|
|
|
|
2015-11-03 19:25:22 +00:00
|
|
|
err = daemon.mountVolumes(container)
|
2015-12-22 00:45:31 +00:00
|
|
|
defer container.UnmountVolumes(true, daemon.LogVolumeEvent)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2015-11-12 19:55:17 +00:00
|
|
|
resolvedPath, absPath, err := container.ResolvePath(path)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2015-11-12 19:55:17 +00:00
|
|
|
return container.StatPath(resolvedPath, absPath)
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
// containerArchivePath creates an archive of the filesystem resource at the specified
|
2015-05-13 01:21:26 +00:00
|
|
|
// path in this container. Returns a tar archive of the resource and stat info
|
|
|
|
// about the resource.
|
2015-11-12 19:55:17 +00:00
|
|
|
func (daemon *Daemon) containerArchivePath(container *container.Container, path string) (content io.ReadCloser, stat *types.ContainerPathStat, err error) {
|
2015-05-13 01:21:26 +00:00
|
|
|
container.Lock()
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
|
|
|
// Wait to unlock the container until the archive is fully read
|
|
|
|
// (see the ReadCloseWrapper func below) or if there is an error
|
|
|
|
// before that occurs.
|
|
|
|
container.Unlock()
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
if err = daemon.Mount(container); err != nil {
|
2015-05-13 01:21:26 +00:00
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
|
|
|
// unmount any volumes
|
2015-12-22 00:45:31 +00:00
|
|
|
container.UnmountVolumes(true, daemon.LogVolumeEvent)
|
2015-05-13 01:21:26 +00:00
|
|
|
// unmount the container's rootfs
|
2015-11-03 01:06:09 +00:00
|
|
|
daemon.Unmount(container)
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2015-11-03 19:25:22 +00:00
|
|
|
if err = daemon.mountVolumes(container); err != nil {
|
2015-05-13 01:21:26 +00:00
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2015-11-12 19:55:17 +00:00
|
|
|
resolvedPath, absPath, err := container.ResolvePath(path)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2015-11-12 19:55:17 +00:00
|
|
|
stat, err = container.StatPath(resolvedPath, absPath)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2015-07-24 21:12:55 +00:00
|
|
|
// We need to rebase the archive entries if the last element of the
|
|
|
|
// resolved path was a symlink that was evaluated and is now different
|
|
|
|
// than the requested path. For example, if the given path was "/foo/bar/",
|
|
|
|
// but it resolved to "/var/lib/docker/containers/{id}/foo/baz/", we want
|
|
|
|
// to ensure that the archive entries start with "bar" and not "baz". This
|
|
|
|
// also catches the case when the root directory of the container is
|
|
|
|
// requested: we want the archive entries to start with "/" and not the
|
|
|
|
// container ID.
|
|
|
|
data, err := archive.TarResourceRebase(resolvedPath, filepath.Base(absPath))
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
content = ioutils.NewReadCloserWrapper(data, func() error {
|
|
|
|
err := data.Close()
|
2015-12-22 00:45:31 +00:00
|
|
|
container.UnmountVolumes(true, daemon.LogVolumeEvent)
|
2015-11-03 01:06:09 +00:00
|
|
|
daemon.Unmount(container)
|
2015-05-13 01:21:26 +00:00
|
|
|
container.Unlock()
|
|
|
|
return err
|
|
|
|
})
|
|
|
|
|
2015-11-03 17:33:13 +00:00
|
|
|
daemon.LogContainerEvent(container, "archive-path")
|
2015-05-13 01:21:26 +00:00
|
|
|
|
|
|
|
return content, stat, nil
|
|
|
|
}
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
// containerExtractToDir extracts the given tar archive to the specified location in the
|
2015-05-13 01:21:26 +00:00
|
|
|
// filesystem of this container. The given path must be of a directory in the
|
|
|
|
// container. If it is not, the error will be ErrExtractPointNotDirectory. If
|
|
|
|
// noOverwriteDirNonDir is true then it will be an error if unpacking the
|
|
|
|
// given content would cause an existing directory to be replaced with a non-
|
|
|
|
// directory and vice versa.
|
2015-11-12 19:55:17 +00:00
|
|
|
func (daemon *Daemon) containerExtractToDir(container *container.Container, path string, noOverwriteDirNonDir bool, content io.Reader) (err error) {
|
2015-05-13 01:21:26 +00:00
|
|
|
container.Lock()
|
|
|
|
defer container.Unlock()
|
|
|
|
|
2015-11-03 01:06:09 +00:00
|
|
|
if err = daemon.Mount(container); err != nil {
|
2015-05-13 01:21:26 +00:00
|
|
|
return err
|
|
|
|
}
|
2015-11-03 01:06:09 +00:00
|
|
|
defer daemon.Unmount(container)
|
2015-05-13 01:21:26 +00:00
|
|
|
|
2015-11-03 19:25:22 +00:00
|
|
|
err = daemon.mountVolumes(container)
|
2015-12-22 00:45:31 +00:00
|
|
|
defer container.UnmountVolumes(true, daemon.LogVolumeEvent)
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-07-24 21:12:55 +00:00
|
|
|
// The destination path needs to be resolved to a host path, with all
|
|
|
|
// symbolic links followed in the scope of the container's rootfs. Note
|
2015-11-12 19:55:17 +00:00
|
|
|
// that we do not use `container.ResolvePath(path)` here because we need
|
2015-07-24 21:12:55 +00:00
|
|
|
// to also evaluate the last path element if it is a symlink. This is so
|
|
|
|
// that you can extract an archive to a symlink that points to a directory.
|
|
|
|
|
2015-05-13 01:21:26 +00:00
|
|
|
// Consider the given path as an absolute path in the container.
|
2015-07-24 21:12:55 +00:00
|
|
|
absPath := archive.PreserveTrailingDotOrSeparator(filepath.Join(string(filepath.Separator), path), path)
|
2015-05-13 01:21:26 +00:00
|
|
|
|
2015-07-24 21:12:55 +00:00
|
|
|
// This will evaluate the last path element if it is a symlink.
|
2015-05-13 01:21:26 +00:00
|
|
|
resolvedPath, err := container.GetResourcePath(absPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
stat, err := os.Lstat(resolvedPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if !stat.IsDir() {
|
|
|
|
return ErrExtractPointNotDirectory
|
|
|
|
}
|
|
|
|
|
2015-07-24 21:12:55 +00:00
|
|
|
// Need to check if the path is in a volume. If it is, it cannot be in a
|
|
|
|
// read-only volume. If it is not in a volume, the container cannot be
|
|
|
|
// configured with a read-only rootfs.
|
|
|
|
|
|
|
|
// Use the resolved path relative to the container rootfs as the new
|
|
|
|
// absPath. This way we fully follow any symlinks in a volume that may
|
|
|
|
// lead back outside the volume.
|
2015-08-25 20:26:49 +00:00
|
|
|
//
|
|
|
|
// The Windows implementation of filepath.Rel in golang 1.4 does not
|
|
|
|
// support volume style file path semantics. On Windows when using the
|
|
|
|
// filter driver, we are guaranteed that the path will always be
|
|
|
|
// a volume file path.
|
|
|
|
var baseRel string
|
|
|
|
if strings.HasPrefix(resolvedPath, `\\?\Volume{`) {
|
2015-11-12 19:55:17 +00:00
|
|
|
if strings.HasPrefix(resolvedPath, container.BaseFS) {
|
|
|
|
baseRel = resolvedPath[len(container.BaseFS):]
|
2015-08-25 20:26:49 +00:00
|
|
|
if baseRel[:1] == `\` {
|
|
|
|
baseRel = baseRel[1:]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2015-11-12 19:55:17 +00:00
|
|
|
baseRel, err = filepath.Rel(container.BaseFS, resolvedPath)
|
2015-08-25 20:26:49 +00:00
|
|
|
}
|
2015-05-13 01:21:26 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-07-24 21:12:55 +00:00
|
|
|
// Make it an absolute path.
|
|
|
|
absPath = filepath.Join(string(filepath.Separator), baseRel)
|
2015-05-13 01:21:26 +00:00
|
|
|
|
2015-07-16 21:14:58 +00:00
|
|
|
toVolume, err := checkIfPathIsInAVolume(container, absPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
2015-11-12 19:55:17 +00:00
|
|
|
if !toVolume && container.HostConfig.ReadonlyRootfs {
|
2015-07-30 21:01:53 +00:00
|
|
|
return ErrRootFSReadOnly
|
2015-05-13 01:21:26 +00:00
|
|
|
}
|
|
|
|
|
2016-02-18 07:57:42 +00:00
|
|
|
uid, gid := daemon.GetRemappedUIDGID()
|
2015-05-13 01:21:26 +00:00
|
|
|
options := &archive.TarOptions{
|
2016-02-18 07:57:42 +00:00
|
|
|
NoOverwriteDirNonDir: noOverwriteDirNonDir,
|
2015-05-13 01:21:26 +00:00
|
|
|
ChownOpts: &archive.TarChownOptions{
|
2016-02-18 07:57:42 +00:00
|
|
|
UID: uid, GID: gid, // TODO: should all ownership be set to root (either real or remapped)?
|
2015-05-13 01:21:26 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
if err := chrootarchive.Untar(content, resolvedPath, options); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-11-03 17:33:13 +00:00
|
|
|
daemon.LogContainerEvent(container, "extract-to-dir")
|
2015-05-13 01:21:26 +00:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2015-11-03 01:19:17 +00:00
|
|
|
|
2015-11-12 19:55:17 +00:00
|
|
|
func (daemon *Daemon) containerCopy(container *container.Container, resource string) (rc io.ReadCloser, err error) {
|
2015-11-03 01:19:17 +00:00
|
|
|
container.Lock()
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
|
|
|
// Wait to unlock the container until the archive is fully read
|
|
|
|
// (see the ReadCloseWrapper func below) or if there is an error
|
|
|
|
// before that occurs.
|
|
|
|
container.Unlock()
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
if err := daemon.Mount(container); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
|
|
|
// unmount any volumes
|
2015-12-22 00:45:31 +00:00
|
|
|
container.UnmountVolumes(true, daemon.LogVolumeEvent)
|
2015-11-03 01:19:17 +00:00
|
|
|
// unmount the container's rootfs
|
|
|
|
daemon.Unmount(container)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2015-11-03 19:25:22 +00:00
|
|
|
if err := daemon.mountVolumes(container); err != nil {
|
2015-11-03 01:19:17 +00:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
basePath, err := container.GetResourcePath(resource)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
stat, err := os.Stat(basePath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
var filter []string
|
|
|
|
if !stat.IsDir() {
|
|
|
|
d, f := filepath.Split(basePath)
|
|
|
|
basePath = d
|
|
|
|
filter = []string{f}
|
|
|
|
} else {
|
|
|
|
filter = []string{filepath.Base(basePath)}
|
|
|
|
basePath = filepath.Dir(basePath)
|
|
|
|
}
|
|
|
|
archive, err := archive.TarWithOptions(basePath, &archive.TarOptions{
|
|
|
|
Compression: archive.Uncompressed,
|
|
|
|
IncludeFiles: filter,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
reader := ioutils.NewReadCloserWrapper(archive, func() error {
|
|
|
|
err := archive.Close()
|
2015-12-22 00:45:31 +00:00
|
|
|
container.UnmountVolumes(true, daemon.LogVolumeEvent)
|
2015-11-03 01:19:17 +00:00
|
|
|
daemon.Unmount(container)
|
|
|
|
container.Unlock()
|
|
|
|
return err
|
|
|
|
})
|
2015-11-03 17:33:13 +00:00
|
|
|
daemon.LogContainerEvent(container, "copy")
|
2015-11-03 01:19:17 +00:00
|
|
|
return reader, nil
|
|
|
|
}
|
2016-01-20 23:32:02 +00:00
|
|
|
|
|
|
|
// CopyOnBuild copies/extracts a source FileInfo to a destination path inside a container
|
|
|
|
// specified by a container object.
|
|
|
|
// TODO: make sure callers don't unnecessarily convert destPath with filepath.FromSlash (Copy does it already).
|
|
|
|
// CopyOnBuild should take in abstract paths (with slashes) and the implementation should convert it to OS-specific paths.
|
|
|
|
func (daemon *Daemon) CopyOnBuild(cID string, destPath string, src builder.FileInfo, decompress bool) error {
|
|
|
|
srcPath := src.Path()
|
|
|
|
destExists := true
|
|
|
|
destDir := false
|
|
|
|
rootUID, rootGID := daemon.GetRemappedUIDGID()
|
|
|
|
|
|
|
|
// Work in daemon-local OS specific file paths
|
|
|
|
destPath = filepath.FromSlash(destPath)
|
|
|
|
|
|
|
|
c, err := daemon.GetContainer(cID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = daemon.Mount(c)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer daemon.Unmount(c)
|
|
|
|
|
|
|
|
dest, err := c.GetResourcePath(destPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Preserve the trailing slash
|
|
|
|
// TODO: why are we appending another path separator if there was already one?
|
|
|
|
if strings.HasSuffix(destPath, string(os.PathSeparator)) || destPath == "." {
|
|
|
|
destDir = true
|
|
|
|
dest += string(os.PathSeparator)
|
|
|
|
}
|
|
|
|
|
|
|
|
destPath = dest
|
|
|
|
|
|
|
|
destStat, err := os.Stat(destPath)
|
|
|
|
if err != nil {
|
|
|
|
if !os.IsNotExist(err) {
|
|
|
|
//logrus.Errorf("Error performing os.Stat on %s. %s", destPath, err)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
destExists = false
|
|
|
|
}
|
|
|
|
|
|
|
|
uidMaps, gidMaps := daemon.GetUIDGIDMaps()
|
|
|
|
archiver := &archive.Archiver{
|
|
|
|
Untar: chrootarchive.Untar,
|
|
|
|
UIDMaps: uidMaps,
|
|
|
|
GIDMaps: gidMaps,
|
|
|
|
}
|
|
|
|
|
|
|
|
if src.IsDir() {
|
|
|
|
// copy as directory
|
|
|
|
if err := archiver.CopyWithTar(srcPath, destPath); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return fixPermissions(srcPath, destPath, rootUID, rootGID, destExists)
|
|
|
|
}
|
|
|
|
if decompress && archive.IsArchivePath(srcPath) {
|
|
|
|
// Only try to untar if it is a file and that we've been told to decompress (when ADD-ing a remote file)
|
|
|
|
|
|
|
|
// First try to unpack the source as an archive
|
|
|
|
// to support the untar feature we need to clean up the path a little bit
|
|
|
|
// because tar is very forgiving. First we need to strip off the archive's
|
|
|
|
// filename from the path but this is only added if it does not end in slash
|
|
|
|
tarDest := destPath
|
|
|
|
if strings.HasSuffix(tarDest, string(os.PathSeparator)) {
|
|
|
|
tarDest = filepath.Dir(destPath)
|
|
|
|
}
|
|
|
|
|
|
|
|
// try to successfully untar the orig
|
|
|
|
err := archiver.UntarPath(srcPath, tarDest)
|
|
|
|
/*
|
|
|
|
if err != nil {
|
|
|
|
logrus.Errorf("Couldn't untar to %s: %v", tarDest, err)
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// only needed for fixPermissions, but might as well put it before CopyFileWithTar
|
|
|
|
if destDir || (destExists && destStat.IsDir()) {
|
|
|
|
destPath = filepath.Join(destPath, src.Name())
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := idtools.MkdirAllNewAs(filepath.Dir(destPath), 0755, rootUID, rootGID); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err := archiver.CopyFileWithTar(srcPath, destPath); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return fixPermissions(srcPath, destPath, rootUID, rootGID, destExists)
|
|
|
|
}
|