2014-08-15 12:29:35 -04:00
|
|
|
package builder
|
2014-08-05 16:17:40 -04:00
|
|
|
|
2014-08-07 01:56:44 -04:00
|
|
|
// internals for handling commands. Covers many areas and a lot of
|
|
|
|
// non-contiguous functionality. Please read the comments.
|
|
|
|
|
2014-08-05 18:41:09 -04:00
|
|
|
import (
|
|
|
|
"crypto/sha256"
|
|
|
|
"encoding/hex"
|
|
|
|
"fmt"
|
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
2014-10-22 14:16:42 -04:00
|
|
|
"net/http"
|
2014-08-05 18:41:09 -04:00
|
|
|
"net/url"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2015-05-07 11:39:42 -04:00
|
|
|
"runtime"
|
2014-08-05 18:41:09 -04:00
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
"syscall"
|
|
|
|
"time"
|
|
|
|
|
2015-03-26 18:22:04 -04:00
|
|
|
"github.com/Sirupsen/logrus"
|
2014-10-13 16:14:35 -04:00
|
|
|
"github.com/docker/docker/builder/parser"
|
2015-06-23 15:58:17 -04:00
|
|
|
"github.com/docker/docker/cliconfig"
|
2014-08-05 18:41:09 -04:00
|
|
|
"github.com/docker/docker/daemon"
|
2015-04-15 07:43:15 -04:00
|
|
|
"github.com/docker/docker/graph"
|
2015-07-20 13:57:15 -04:00
|
|
|
"github.com/docker/docker/image"
|
2014-09-30 02:23:36 -04:00
|
|
|
"github.com/docker/docker/pkg/archive"
|
2014-10-29 15:06:51 -04:00
|
|
|
"github.com/docker/docker/pkg/chrootarchive"
|
2015-03-29 17:17:23 -04:00
|
|
|
"github.com/docker/docker/pkg/httputils"
|
2015-01-26 23:56:34 -05:00
|
|
|
"github.com/docker/docker/pkg/ioutils"
|
2015-03-17 22:18:41 -04:00
|
|
|
"github.com/docker/docker/pkg/jsonmessage"
|
2014-08-05 18:41:09 -04:00
|
|
|
"github.com/docker/docker/pkg/parsers"
|
2015-02-24 03:51:46 -05:00
|
|
|
"github.com/docker/docker/pkg/progressreader"
|
2015-03-24 07:25:26 -04:00
|
|
|
"github.com/docker/docker/pkg/stringid"
|
2014-08-05 18:41:09 -04:00
|
|
|
"github.com/docker/docker/pkg/system"
|
|
|
|
"github.com/docker/docker/pkg/tarsum"
|
2014-11-24 18:47:42 -05:00
|
|
|
"github.com/docker/docker/pkg/urlutil"
|
2015-04-22 08:06:58 -04:00
|
|
|
"github.com/docker/docker/registry"
|
2015-02-06 09:33:01 -05:00
|
|
|
"github.com/docker/docker/runconfig"
|
2014-08-05 18:41:09 -04:00
|
|
|
)
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) readContext(context io.Reader) (err error) {
|
2014-08-05 16:17:40 -04:00
|
|
|
tmpdirPath, err := ioutil.TempDir("", "docker-build")
|
|
|
|
if err != nil {
|
2015-07-15 09:04:35 -04:00
|
|
|
return
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
2015-07-15 09:04:35 -04:00
|
|
|
// Make sure we clean-up upon error. In the happy case the caller
|
|
|
|
// is expected to manage the clean-up
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
|
|
|
if e := os.RemoveAll(tmpdirPath); e != nil {
|
|
|
|
logrus.Debugf("[BUILDER] failed to remove temporary context: %s", e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2014-08-05 16:17:40 -04:00
|
|
|
decompressedStream, err := archive.DecompressStream(context)
|
|
|
|
if err != nil {
|
2015-07-15 09:04:35 -04:00
|
|
|
return
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
2015-04-02 13:42:40 -04:00
|
|
|
if b.context, err = tarsum.NewTarSum(decompressedStream, true, tarsum.Version1); err != nil {
|
2015-07-15 09:04:35 -04:00
|
|
|
return
|
2014-08-21 16:12:52 -04:00
|
|
|
}
|
2014-10-29 15:06:51 -04:00
|
|
|
|
2015-07-15 09:04:35 -04:00
|
|
|
if err = chrootarchive.Untar(b.context, tmpdirPath, nil); err != nil {
|
|
|
|
return
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
b.contextPath = tmpdirPath
|
2015-07-15 09:04:35 -04:00
|
|
|
return
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) commit(id string, autoCmd *runconfig.Command, comment string) error {
|
2015-01-09 16:07:00 -05:00
|
|
|
if b.disableCommit {
|
|
|
|
return nil
|
|
|
|
}
|
2014-10-28 17:06:23 -04:00
|
|
|
if b.image == "" && !b.noBaseImage {
|
2014-08-05 16:17:40 -04:00
|
|
|
return fmt.Errorf("Please provide a source image with `from` prior to commit")
|
|
|
|
}
|
2014-08-11 11:44:31 -04:00
|
|
|
b.Config.Image = b.image
|
2014-08-05 16:17:40 -04:00
|
|
|
if id == "" {
|
2014-08-11 11:44:31 -04:00
|
|
|
cmd := b.Config.Cmd
|
2015-05-07 11:39:42 -04:00
|
|
|
if runtime.GOOS != "windows" {
|
|
|
|
b.Config.Cmd = runconfig.NewCommand("/bin/sh", "-c", "#(nop) "+comment)
|
|
|
|
} else {
|
|
|
|
b.Config.Cmd = runconfig.NewCommand("cmd", "/S /C", "REM (nop) "+comment)
|
|
|
|
}
|
2015-04-10 20:05:21 -04:00
|
|
|
defer func(cmd *runconfig.Command) { b.Config.Cmd = cmd }(cmd)
|
2014-08-05 16:17:40 -04:00
|
|
|
|
|
|
|
hit, err := b.probeCache()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if hit {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2014-09-04 11:43:28 -04:00
|
|
|
container, err := b.create()
|
2014-08-05 16:17:40 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
id = container.ID
|
|
|
|
|
|
|
|
if err := container.Mount(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer container.Unmount()
|
|
|
|
}
|
2014-12-16 18:06:35 -05:00
|
|
|
container, err := b.Daemon.Get(id)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Note: Actually copy the struct
|
2014-08-11 11:44:31 -04:00
|
|
|
autoConfig := *b.Config
|
2014-08-05 16:17:40 -04:00
|
|
|
autoConfig.Cmd = autoCmd
|
2014-08-30 07:34:09 -04:00
|
|
|
|
2015-06-20 06:40:37 -04:00
|
|
|
commitCfg := &daemon.ContainerCommitConfig{
|
|
|
|
Author: b.maintainer,
|
|
|
|
Pause: true,
|
|
|
|
Config: &autoConfig,
|
|
|
|
}
|
|
|
|
|
2014-08-05 16:17:40 -04:00
|
|
|
// Commit the container
|
2015-06-20 06:40:37 -04:00
|
|
|
image, err := b.Daemon.Commit(container, commitCfg)
|
2014-08-05 16:17:40 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-04-07 22:29:29 -04:00
|
|
|
b.Daemon.Graph().Retain(b.id, image.ID)
|
|
|
|
b.activeImages = append(b.activeImages, image.ID)
|
2014-08-05 16:17:40 -04:00
|
|
|
b.image = image.ID
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2014-09-16 12:58:20 -04:00
|
|
|
type copyInfo struct {
|
|
|
|
origPath string
|
|
|
|
destPath string
|
2014-09-22 09:41:02 -04:00
|
|
|
hash string
|
2014-09-16 12:58:20 -04:00
|
|
|
decompress bool
|
|
|
|
tmpDir string
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) runContextCommand(args []string, allowRemote bool, allowDecompression bool, cmdName string) error {
|
2014-08-05 16:17:40 -04:00
|
|
|
if b.context == nil {
|
|
|
|
return fmt.Errorf("No context given. Impossible to use %s", cmdName)
|
|
|
|
}
|
|
|
|
|
2014-09-16 12:58:20 -04:00
|
|
|
if len(args) < 2 {
|
|
|
|
return fmt.Errorf("Invalid %s format - at least two arguments required", cmdName)
|
|
|
|
}
|
|
|
|
|
2015-07-12 12:05:10 -04:00
|
|
|
// Work in daemon-specific filepath semantics
|
|
|
|
dest := filepath.FromSlash(args[len(args)-1]) // last one is always the dest
|
2014-09-16 12:58:20 -04:00
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
copyInfos := []*copyInfo{}
|
2014-09-16 12:58:20 -04:00
|
|
|
|
|
|
|
b.Config.Image = b.image
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
for _, ci := range copyInfos {
|
|
|
|
if ci.tmpDir != "" {
|
|
|
|
os.RemoveAll(ci.tmpDir)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Loop through each src file and calculate the info we need to
|
|
|
|
// do the copy (e.g. hash value if cached). Don't actually do
|
|
|
|
// the copy until we've looked at all src files
|
2014-09-22 09:41:02 -04:00
|
|
|
for _, orig := range args[0 : len(args)-1] {
|
2015-04-26 12:50:25 -04:00
|
|
|
if err := calcCopyInfo(
|
|
|
|
b,
|
|
|
|
cmdName,
|
|
|
|
©Infos,
|
|
|
|
orig,
|
|
|
|
dest,
|
|
|
|
allowRemote,
|
|
|
|
allowDecompression,
|
2015-04-10 15:39:42 -04:00
|
|
|
true,
|
2015-04-26 12:50:25 -04:00
|
|
|
); err != nil {
|
2014-09-16 12:58:20 -04:00
|
|
|
return err
|
|
|
|
}
|
2014-09-22 09:41:02 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if len(copyInfos) == 0 {
|
|
|
|
return fmt.Errorf("No source files were specified")
|
|
|
|
}
|
2015-07-12 12:05:10 -04:00
|
|
|
if len(copyInfos) > 1 && !strings.HasSuffix(dest, string(os.PathSeparator)) {
|
2014-09-22 09:41:02 -04:00
|
|
|
return fmt.Errorf("When using %s with more than one source file, the destination must be a directory and end with a /", cmdName)
|
|
|
|
}
|
2014-09-16 12:58:20 -04:00
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
// For backwards compat, if there's just one CI then use it as the
|
|
|
|
// cache look-up string, otherwise hash 'em all into one
|
|
|
|
var srcHash string
|
|
|
|
var origPaths string
|
|
|
|
|
|
|
|
if len(copyInfos) == 1 {
|
|
|
|
srcHash = copyInfos[0].hash
|
|
|
|
origPaths = copyInfos[0].origPath
|
|
|
|
} else {
|
|
|
|
var hashs []string
|
|
|
|
var origs []string
|
|
|
|
for _, ci := range copyInfos {
|
|
|
|
hashs = append(hashs, ci.hash)
|
|
|
|
origs = append(origs, ci.origPath)
|
2014-09-16 12:58:20 -04:00
|
|
|
}
|
2014-09-22 09:41:02 -04:00
|
|
|
hasher := sha256.New()
|
|
|
|
hasher.Write([]byte(strings.Join(hashs, ",")))
|
|
|
|
srcHash = "multi:" + hex.EncodeToString(hasher.Sum(nil))
|
|
|
|
origPaths = strings.Join(origs, " ")
|
2014-09-16 12:58:20 -04:00
|
|
|
}
|
2014-08-05 16:17:40 -04:00
|
|
|
|
2014-08-11 11:44:31 -04:00
|
|
|
cmd := b.Config.Cmd
|
2015-05-07 11:39:42 -04:00
|
|
|
if runtime.GOOS != "windows" {
|
|
|
|
b.Config.Cmd = runconfig.NewCommand("/bin/sh", "-c", fmt.Sprintf("#(nop) %s %s in %s", cmdName, srcHash, dest))
|
|
|
|
} else {
|
|
|
|
b.Config.Cmd = runconfig.NewCommand("cmd", "/S /C", fmt.Sprintf("REM (nop) %s %s in %s", cmdName, srcHash, dest))
|
|
|
|
}
|
2015-04-10 20:05:21 -04:00
|
|
|
defer func(cmd *runconfig.Command) { b.Config.Cmd = cmd }(cmd)
|
2014-08-05 16:17:40 -04:00
|
|
|
|
2014-09-16 12:58:20 -04:00
|
|
|
hit, err := b.probeCache()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-02-25 17:04:35 -05:00
|
|
|
|
|
|
|
if hit {
|
2014-09-16 12:58:20 -04:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:23:59 -04:00
|
|
|
container, _, err := b.Daemon.Create(b.Config, nil, "")
|
2014-09-16 12:58:20 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
b.TmpContainers[container.ID] = struct{}{}
|
|
|
|
|
|
|
|
if err := container.Mount(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer container.Unmount()
|
|
|
|
|
2015-06-11 14:29:29 -04:00
|
|
|
if err := container.PrepareStorage(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2014-09-16 12:58:20 -04:00
|
|
|
for _, ci := range copyInfos {
|
|
|
|
if err := b.addContext(container, ci.origPath, ci.destPath, ci.decompress); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-11 14:29:29 -04:00
|
|
|
if err := container.CleanupStorage(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
if err := b.commit(container.ID, cmd, fmt.Sprintf("%s %s in %s", cmdName, origPaths, dest)); err != nil {
|
2014-09-16 12:58:20 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func calcCopyInfo(b *builder, cmdName string, cInfos *[]*copyInfo, origPath string, destPath string, allowRemote bool, allowDecompression bool, allowWildcards bool) error {
|
2014-09-22 09:41:02 -04:00
|
|
|
|
2015-07-12 12:05:10 -04:00
|
|
|
// Work in daemon-specific OS filepath semantics. However, we save
|
|
|
|
// the the origPath passed in here, as it might also be a URL which
|
|
|
|
// we need to check for in this function.
|
|
|
|
passedInOrigPath := origPath
|
|
|
|
origPath = filepath.FromSlash(origPath)
|
|
|
|
destPath = filepath.FromSlash(destPath)
|
|
|
|
|
|
|
|
if origPath != "" && origPath[0] == os.PathSeparator && len(origPath) > 1 {
|
2014-09-22 09:41:02 -04:00
|
|
|
origPath = origPath[1:]
|
|
|
|
}
|
2015-07-12 12:05:10 -04:00
|
|
|
origPath = strings.TrimPrefix(origPath, "."+string(os.PathSeparator))
|
2014-09-22 09:41:02 -04:00
|
|
|
|
2014-12-12 13:32:11 -05:00
|
|
|
// Twiddle the destPath when its a relative path - meaning, make it
|
|
|
|
// relative to the WORKINGDIR
|
|
|
|
if !filepath.IsAbs(destPath) {
|
2015-07-12 12:05:10 -04:00
|
|
|
hasSlash := strings.HasSuffix(destPath, string(os.PathSeparator))
|
|
|
|
destPath = filepath.Join(string(os.PathSeparator), filepath.FromSlash(b.Config.WorkingDir), destPath)
|
2014-12-12 13:32:11 -05:00
|
|
|
|
|
|
|
// Make sure we preserve any trailing slash
|
|
|
|
if hasSlash {
|
2015-07-12 12:05:10 -04:00
|
|
|
destPath += string(os.PathSeparator)
|
2014-12-12 13:32:11 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
// In the remote/URL case, download it and gen its hashcode
|
2015-07-12 12:05:10 -04:00
|
|
|
if urlutil.IsURL(passedInOrigPath) {
|
|
|
|
|
|
|
|
// As it's a URL, we go back to processing on what was passed in
|
|
|
|
// to this function
|
|
|
|
origPath = passedInOrigPath
|
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
if !allowRemote {
|
|
|
|
return fmt.Errorf("Source can't be a URL for %s", cmdName)
|
|
|
|
}
|
2014-08-05 16:17:40 -04:00
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
ci := copyInfo{}
|
|
|
|
ci.origPath = origPath
|
|
|
|
ci.hash = origPath // default to this but can change
|
|
|
|
ci.destPath = destPath
|
|
|
|
ci.decompress = false
|
|
|
|
*cInfos = append(*cInfos, &ci)
|
2014-09-16 12:58:20 -04:00
|
|
|
|
2014-08-05 16:17:40 -04:00
|
|
|
// Initiate the download
|
2015-03-29 17:17:23 -04:00
|
|
|
resp, err := httputils.Download(ci.origPath)
|
2014-08-05 16:17:40 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a tmp dir
|
|
|
|
tmpDirName, err := ioutil.TempDir(b.contextPath, "docker-remote")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2014-09-16 12:58:20 -04:00
|
|
|
ci.tmpDir = tmpDirName
|
2014-08-05 16:17:40 -04:00
|
|
|
|
|
|
|
// Create a tmp file within our tmp dir
|
2015-05-07 11:39:42 -04:00
|
|
|
tmpFileName := filepath.Join(tmpDirName, "tmp")
|
2014-08-05 16:17:40 -04:00
|
|
|
tmpFile, err := os.OpenFile(tmpFileName, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Download and dump result to tmp file
|
2015-02-24 03:51:46 -05:00
|
|
|
if _, err := io.Copy(tmpFile, progressreader.New(progressreader.Config{
|
|
|
|
In: resp.Body,
|
|
|
|
Out: b.OutOld,
|
|
|
|
Formatter: b.StreamFormatter,
|
2015-07-23 17:19:58 -04:00
|
|
|
Size: resp.ContentLength,
|
2015-02-24 03:51:46 -05:00
|
|
|
NewLines: true,
|
|
|
|
ID: "",
|
|
|
|
Action: "Downloading",
|
|
|
|
})); err != nil {
|
2014-08-05 16:17:40 -04:00
|
|
|
tmpFile.Close()
|
|
|
|
return err
|
|
|
|
}
|
2014-09-02 20:17:08 -04:00
|
|
|
fmt.Fprintf(b.OutStream, "\n")
|
2014-08-05 16:17:40 -04:00
|
|
|
tmpFile.Close()
|
|
|
|
|
2014-10-22 14:16:42 -04:00
|
|
|
// Set the mtime to the Last-Modified header value if present
|
|
|
|
// Otherwise just remove atime and mtime
|
|
|
|
times := make([]syscall.Timespec, 2)
|
|
|
|
|
|
|
|
lastMod := resp.Header.Get("Last-Modified")
|
|
|
|
if lastMod != "" {
|
|
|
|
mTime, err := http.ParseTime(lastMod)
|
|
|
|
// If we can't parse it then just let it default to 'zero'
|
|
|
|
// otherwise use the parsed time value
|
|
|
|
if err == nil {
|
|
|
|
times[1] = syscall.NsecToTimespec(mTime.UnixNano())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := system.UtimesNano(tmpFileName, times); err != nil {
|
2014-08-05 16:17:40 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-05-07 11:39:42 -04:00
|
|
|
ci.origPath = filepath.Join(filepath.Base(tmpDirName), filepath.Base(tmpFileName))
|
2014-08-05 16:17:40 -04:00
|
|
|
|
|
|
|
// If the destination is a directory, figure out the filename.
|
2015-07-12 12:05:10 -04:00
|
|
|
if strings.HasSuffix(ci.destPath, string(os.PathSeparator)) {
|
2014-09-22 09:41:02 -04:00
|
|
|
u, err := url.Parse(origPath)
|
2014-08-05 16:17:40 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
path := u.Path
|
2015-07-12 12:05:10 -04:00
|
|
|
if strings.HasSuffix(path, string(os.PathSeparator)) {
|
2014-08-05 16:17:40 -04:00
|
|
|
path = path[:len(path)-1]
|
|
|
|
}
|
2015-07-12 12:05:10 -04:00
|
|
|
parts := strings.Split(path, string(os.PathSeparator))
|
2014-08-05 16:17:40 -04:00
|
|
|
filename := parts[len(parts)-1]
|
|
|
|
if filename == "" {
|
|
|
|
return fmt.Errorf("cannot determine filename from url: %s", u)
|
|
|
|
}
|
2014-09-16 12:58:20 -04:00
|
|
|
ci.destPath = ci.destPath + filename
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
2015-01-08 09:56:30 -05:00
|
|
|
// Calc the checksum, even if we're using the cache
|
|
|
|
r, err := archive.Tar(tmpFileName, archive.Uncompressed)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2014-09-22 09:41:02 -04:00
|
|
|
}
|
2015-04-02 13:42:40 -04:00
|
|
|
tarSum, err := tarsum.NewTarSum(r, true, tarsum.Version1)
|
2015-01-08 09:56:30 -05:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if _, err := io.Copy(ioutil.Discard, tarSum); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
ci.hash = tarSum.Sum(nil)
|
|
|
|
r.Close()
|
2014-09-22 09:41:02 -04:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Deal with wildcards
|
2015-07-22 01:29:03 -04:00
|
|
|
if allowWildcards && containsWildcards(origPath) {
|
2014-09-22 09:41:02 -04:00
|
|
|
for _, fileInfo := range b.context.GetSums() {
|
|
|
|
if fileInfo.Name() == "" {
|
|
|
|
continue
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
2015-05-07 11:39:42 -04:00
|
|
|
match, _ := filepath.Match(origPath, fileInfo.Name())
|
2014-09-22 09:41:02 -04:00
|
|
|
if !match {
|
|
|
|
continue
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
2014-09-22 09:41:02 -04:00
|
|
|
|
2015-04-10 15:39:42 -04:00
|
|
|
// Note we set allowWildcards to false in case the name has
|
|
|
|
// a * in it
|
|
|
|
calcCopyInfo(b, cmdName, cInfos, fileInfo.Name(), destPath, allowRemote, allowDecompression, false)
|
2014-09-22 09:41:02 -04:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Must be a dir or a file
|
|
|
|
|
|
|
|
if err := b.checkPathForAddition(origPath); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-05-07 11:39:42 -04:00
|
|
|
fi, _ := os.Stat(filepath.Join(b.contextPath, origPath))
|
2014-09-22 09:41:02 -04:00
|
|
|
|
|
|
|
ci := copyInfo{}
|
|
|
|
ci.origPath = origPath
|
|
|
|
ci.hash = origPath
|
|
|
|
ci.destPath = destPath
|
|
|
|
ci.decompress = allowDecompression
|
|
|
|
*cInfos = append(*cInfos, &ci)
|
|
|
|
|
|
|
|
// Deal with the single file case
|
|
|
|
if !fi.IsDir() {
|
|
|
|
// This will match first file in sums of the archive
|
|
|
|
fis := b.context.GetSums().GetFile(ci.origPath)
|
|
|
|
if fis != nil {
|
|
|
|
ci.hash = "file:" + fis.Sum()
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
2014-09-22 09:41:02 -04:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Must be a dir
|
|
|
|
var subfiles []string
|
2015-05-07 11:39:42 -04:00
|
|
|
absOrigPath := filepath.Join(b.contextPath, ci.origPath)
|
2014-08-05 16:17:40 -04:00
|
|
|
|
2014-09-22 09:41:02 -04:00
|
|
|
// Add a trailing / to make sure we only pick up nested files under
|
|
|
|
// the dir and not sibling files of the dir that just happen to
|
|
|
|
// start with the same chars
|
2015-07-12 12:05:10 -04:00
|
|
|
if !strings.HasSuffix(absOrigPath, string(os.PathSeparator)) {
|
|
|
|
absOrigPath += string(os.PathSeparator)
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
|
|
|
|
2015-07-12 12:05:10 -04:00
|
|
|
// Need path w/o slash too to find matching dir w/o trailing slash
|
2014-09-22 09:41:02 -04:00
|
|
|
absOrigPathNoSlash := absOrigPath[:len(absOrigPath)-1]
|
|
|
|
|
|
|
|
for _, fileInfo := range b.context.GetSums() {
|
2015-05-07 11:39:42 -04:00
|
|
|
absFile := filepath.Join(b.contextPath, fileInfo.Name())
|
2014-10-23 17:30:11 -04:00
|
|
|
// Any file in the context that starts with the given path will be
|
|
|
|
// picked up and its hashcode used. However, we'll exclude the
|
|
|
|
// root dir itself. We do this for a coupel of reasons:
|
|
|
|
// 1 - ADD/COPY will not copy the dir itself, just its children
|
|
|
|
// so there's no reason to include it in the hash calc
|
|
|
|
// 2 - the metadata on the dir will change when any child file
|
|
|
|
// changes. This will lead to a miss in the cache check if that
|
|
|
|
// child file is in the .dockerignore list.
|
|
|
|
if strings.HasPrefix(absFile, absOrigPath) && absFile != absOrigPathNoSlash {
|
2014-09-22 09:41:02 -04:00
|
|
|
subfiles = append(subfiles, fileInfo.Sum())
|
|
|
|
}
|
2014-08-05 16:17:40 -04:00
|
|
|
}
|
2014-09-22 09:41:02 -04:00
|
|
|
sort.Strings(subfiles)
|
|
|
|
hasher := sha256.New()
|
|
|
|
hasher.Write([]byte(strings.Join(subfiles, ",")))
|
|
|
|
ci.hash = "dir:" + hex.EncodeToString(hasher.Sum(nil))
|
|
|
|
|
2014-08-05 16:17:40 -04:00
|
|
|
return nil
|
|
|
|
}
|
2014-08-05 18:41:09 -04:00
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func containsWildcards(name string) bool {
|
2014-09-22 09:41:02 -04:00
|
|
|
for i := 0; i < len(name); i++ {
|
|
|
|
ch := name[i]
|
|
|
|
if ch == '\\' {
|
|
|
|
i++
|
|
|
|
} else if ch == '*' || ch == '?' || ch == '[' {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) pullImage(name string) (*image.Image, error) {
|
2014-08-05 18:41:09 -04:00
|
|
|
remote, tag := parsers.ParseRepositoryTag(name)
|
2014-09-03 11:27:25 -04:00
|
|
|
if tag == "" {
|
|
|
|
tag = "latest"
|
|
|
|
}
|
2015-04-15 07:43:15 -04:00
|
|
|
|
2015-06-23 15:58:17 -04:00
|
|
|
pullRegistryAuth := &cliconfig.AuthConfig{}
|
|
|
|
if len(b.AuthConfigs) > 0 {
|
2014-08-05 18:41:09 -04:00
|
|
|
// The request came with a full auth config file, we prefer to use that
|
2015-03-31 19:21:37 -04:00
|
|
|
repoInfo, err := b.Daemon.RegistryService.ResolveRepository(remote)
|
2014-08-05 18:41:09 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2015-06-23 15:58:17 -04:00
|
|
|
|
|
|
|
resolvedConfig := registry.ResolveAuthConfig(
|
|
|
|
&cliconfig.ConfigFile{AuthConfigs: b.AuthConfigs},
|
|
|
|
repoInfo.Index,
|
|
|
|
)
|
|
|
|
pullRegistryAuth = &resolvedConfig
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
2015-04-15 07:43:15 -04:00
|
|
|
|
|
|
|
imagePullConfig := &graph.ImagePullConfig{
|
|
|
|
AuthConfig: pullRegistryAuth,
|
|
|
|
OutStream: ioutils.NopWriteCloser(b.OutOld),
|
|
|
|
}
|
|
|
|
|
2015-04-21 17:23:48 -04:00
|
|
|
if err := b.Daemon.Repositories().Pull(remote, tag, imagePullConfig); err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
return nil, err
|
|
|
|
}
|
2015-04-15 07:43:15 -04:00
|
|
|
|
2014-08-26 15:25:44 -04:00
|
|
|
image, err := b.Daemon.Repositories().LookupImage(name)
|
2014-08-05 18:41:09 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return image, nil
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) processImageFrom(img *image.Image) error {
|
2014-08-05 18:41:09 -04:00
|
|
|
b.image = img.ID
|
2014-08-13 06:07:41 -04:00
|
|
|
|
2014-08-05 18:41:09 -04:00
|
|
|
if img.Config != nil {
|
2014-08-11 11:44:31 -04:00
|
|
|
b.Config = img.Config
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
2014-08-13 06:07:41 -04:00
|
|
|
|
2015-06-01 19:42:27 -04:00
|
|
|
// The default path will be blank on Windows (set by HCS)
|
|
|
|
if len(b.Config.Env) == 0 && daemon.DefaultPathEnv != "" {
|
2014-08-11 11:44:31 -04:00
|
|
|
b.Config.Env = append(b.Config.Env, "PATH="+daemon.DefaultPathEnv)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
2014-08-13 06:07:41 -04:00
|
|
|
|
2014-08-05 18:41:09 -04:00
|
|
|
// Process ONBUILD triggers if they exist
|
2014-08-11 11:44:31 -04:00
|
|
|
if nTriggers := len(b.Config.OnBuild); nTriggers != 0 {
|
2014-08-26 15:25:44 -04:00
|
|
|
fmt.Fprintf(b.ErrStream, "# Executing %d build triggers\n", nTriggers)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2015-04-27 16:33:30 -04:00
|
|
|
// Copy the ONBUILD triggers, and remove them from the config, since the config will be committed.
|
2014-08-11 11:44:31 -04:00
|
|
|
onBuildTriggers := b.Config.OnBuild
|
|
|
|
b.Config.OnBuild = []string{}
|
2014-08-05 18:41:09 -04:00
|
|
|
|
2014-10-13 16:14:35 -04:00
|
|
|
// parse the ONBUILD triggers by invoking the parser
|
2014-09-23 16:31:42 -04:00
|
|
|
for stepN, step := range onBuildTriggers {
|
2014-10-13 16:14:35 -04:00
|
|
|
ast, err := parser.Parse(strings.NewReader(step))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2014-10-13 16:14:35 -04:00
|
|
|
for i, n := range ast.Children {
|
|
|
|
switch strings.ToUpper(n.Value) {
|
|
|
|
case "ONBUILD":
|
|
|
|
return fmt.Errorf("Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed")
|
|
|
|
case "MAINTAINER", "FROM":
|
|
|
|
return fmt.Errorf("%s isn't allowed as an ONBUILD trigger", n.Value)
|
|
|
|
}
|
2014-08-05 18:41:09 -04:00
|
|
|
|
2014-09-23 16:31:42 -04:00
|
|
|
fmt.Fprintf(b.OutStream, "Trigger %d, %s\n", stepN, step)
|
2014-10-13 16:14:35 -04:00
|
|
|
|
|
|
|
if err := b.dispatch(i, n); err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2014-08-26 15:25:44 -04:00
|
|
|
// probeCache checks to see if image-caching is enabled (`b.UtilizeCache`)
|
2014-08-11 11:44:31 -04:00
|
|
|
// and if so attempts to look up the current `b.image` and `b.Config` pair
|
2014-08-26 15:25:44 -04:00
|
|
|
// in the current server `b.Daemon`. If an image is found, probeCache returns
|
2014-08-05 18:41:09 -04:00
|
|
|
// `(true, nil)`. If no image is found, it returns `(false, nil)`. If there
|
|
|
|
// is any error, it returns `(false, err)`.
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) probeCache() (bool, error) {
|
2015-02-25 13:27:32 -05:00
|
|
|
if !b.UtilizeCache || b.cacheBusted {
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
cache, err := b.Daemon.ImageGetCached(b.image, b.Config)
|
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
if cache == nil {
|
2015-03-26 18:22:04 -04:00
|
|
|
logrus.Debugf("[BUILDER] Cache miss")
|
2015-02-25 13:27:32 -05:00
|
|
|
b.cacheBusted = true
|
|
|
|
return false, nil
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
2015-02-25 13:27:32 -05:00
|
|
|
|
|
|
|
fmt.Fprintf(b.OutStream, " ---> Using cache\n")
|
2015-03-26 18:22:04 -04:00
|
|
|
logrus.Debugf("[BUILDER] Use cached version")
|
2015-02-25 13:27:32 -05:00
|
|
|
b.image = cache.ID
|
2015-04-07 22:29:29 -04:00
|
|
|
b.Daemon.Graph().Retain(b.id, cache.ID)
|
|
|
|
b.activeImages = append(b.activeImages, cache.ID)
|
2015-02-25 13:27:32 -05:00
|
|
|
return true, nil
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) create() (*daemon.Container, error) {
|
2014-10-28 17:06:23 -04:00
|
|
|
if b.image == "" && !b.noBaseImage {
|
2014-08-05 18:41:09 -04:00
|
|
|
return nil, fmt.Errorf("Please provide a source image with `from` prior to run")
|
|
|
|
}
|
2014-08-11 11:44:31 -04:00
|
|
|
b.Config.Image = b.image
|
2014-08-05 18:41:09 -04:00
|
|
|
|
2015-02-06 09:33:01 -05:00
|
|
|
hostConfig := &runconfig.HostConfig{
|
2015-07-25 05:11:45 -04:00
|
|
|
CPUShares: b.cpuShares,
|
|
|
|
CPUPeriod: b.cpuPeriod,
|
|
|
|
CPUQuota: b.cpuQuota,
|
2015-03-26 19:14:31 -04:00
|
|
|
CpusetCpus: b.cpuSetCpus,
|
|
|
|
CpusetMems: b.cpuSetMems,
|
|
|
|
CgroupParent: b.cgroupParent,
|
|
|
|
Memory: b.memory,
|
|
|
|
MemorySwap: b.memorySwap,
|
2015-07-22 22:26:06 -04:00
|
|
|
Ulimits: b.ulimits,
|
2015-02-06 09:33:01 -05:00
|
|
|
}
|
|
|
|
|
2014-09-04 11:43:28 -04:00
|
|
|
config := *b.Config
|
|
|
|
|
2014-08-05 18:41:09 -04:00
|
|
|
// Create the container
|
2015-02-06 09:33:01 -05:00
|
|
|
c, warnings, err := b.Daemon.Create(b.Config, hostConfig, "")
|
2014-08-05 18:41:09 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2014-09-04 11:43:28 -04:00
|
|
|
for _, warning := range warnings {
|
|
|
|
fmt.Fprintf(b.OutStream, " ---> [Warning] %s\n", warning)
|
|
|
|
}
|
2014-08-26 15:25:44 -04:00
|
|
|
|
2014-08-11 11:44:31 -04:00
|
|
|
b.TmpContainers[c.ID] = struct{}{}
|
2015-03-24 07:25:26 -04:00
|
|
|
fmt.Fprintf(b.OutStream, " ---> Running in %s\n", stringid.TruncateID(c.ID))
|
2014-08-05 18:41:09 -04:00
|
|
|
|
2015-04-10 20:05:21 -04:00
|
|
|
if config.Cmd.Len() > 0 {
|
2015-01-08 20:00:00 -05:00
|
|
|
// override the entry point that may have been picked up from the base image
|
2015-04-10 20:05:21 -04:00
|
|
|
s := config.Cmd.Slice()
|
|
|
|
c.Path = s[0]
|
|
|
|
c.Args = s[1:]
|
2015-01-08 20:00:00 -05:00
|
|
|
} else {
|
2015-04-10 20:05:21 -04:00
|
|
|
config.Cmd = runconfig.NewCommand()
|
2015-01-08 20:00:00 -05:00
|
|
|
}
|
2014-08-05 18:41:09 -04:00
|
|
|
|
|
|
|
return c, nil
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) run(c *daemon.Container) error {
|
2015-02-04 18:37:14 -05:00
|
|
|
var errCh chan error
|
|
|
|
if b.Verbose {
|
2015-04-06 15:19:38 -04:00
|
|
|
errCh = c.Attach(nil, b.OutStream, b.ErrStream)
|
2015-02-04 18:37:14 -05:00
|
|
|
}
|
|
|
|
|
2014-08-05 18:41:09 -04:00
|
|
|
//start the container
|
|
|
|
if err := c.Start(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-03-10 18:10:00 -04:00
|
|
|
finished := make(chan struct{})
|
|
|
|
defer close(finished)
|
|
|
|
go func() {
|
|
|
|
select {
|
|
|
|
case <-b.cancelled:
|
2015-03-26 18:22:04 -04:00
|
|
|
logrus.Debugln("Build cancelled, killing container:", c.ID)
|
2015-03-10 18:10:00 -04:00
|
|
|
c.Kill()
|
|
|
|
case <-finished:
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2015-02-20 16:26:11 -05:00
|
|
|
if b.Verbose {
|
|
|
|
// Block on reading output from container, stop on err or chan closed
|
|
|
|
if err := <-errCh; err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Wait for it to finish
|
2014-08-31 11:20:35 -04:00
|
|
|
if ret, _ := c.WaitStop(-1 * time.Second); ret != 0 {
|
2015-04-16 15:22:32 -04:00
|
|
|
return &jsonmessage.JSONError{
|
2015-05-09 12:22:30 -04:00
|
|
|
Message: fmt.Sprintf("The command '%s' returned a non-zero code: %d", b.Config.Cmd.ToString(), ret),
|
2014-08-05 18:41:09 -04:00
|
|
|
Code: ret,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) checkPathForAddition(orig string) error {
|
2015-05-07 11:39:42 -04:00
|
|
|
origPath := filepath.Join(b.contextPath, orig)
|
2014-08-13 06:07:41 -04:00
|
|
|
origPath, err := filepath.EvalSymlinks(origPath)
|
|
|
|
if err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return fmt.Errorf("%s: no such file or directory", orig)
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
2015-05-07 11:39:42 -04:00
|
|
|
contextPath, err := filepath.EvalSymlinks(b.contextPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if !strings.HasPrefix(origPath, contextPath) {
|
2014-08-05 18:41:09 -04:00
|
|
|
return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)
|
|
|
|
}
|
2014-08-13 06:07:41 -04:00
|
|
|
if _, err := os.Stat(origPath); err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return fmt.Errorf("%s: no such file or directory", orig)
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) addContext(container *daemon.Container, orig, dest string, decompress bool) error {
|
2014-08-05 18:41:09 -04:00
|
|
|
var (
|
|
|
|
err error
|
|
|
|
destExists = true
|
2015-05-07 11:39:42 -04:00
|
|
|
origPath = filepath.Join(b.contextPath, orig)
|
2015-03-20 04:59:15 -04:00
|
|
|
destPath string
|
2014-08-05 18:41:09 -04:00
|
|
|
)
|
|
|
|
|
2015-07-12 12:05:10 -04:00
|
|
|
// Work in daemon-local OS specific file paths
|
|
|
|
dest = filepath.FromSlash(dest)
|
|
|
|
|
2015-03-20 04:59:15 -04:00
|
|
|
destPath, err = container.GetResourcePath(dest)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2015-07-12 12:05:10 -04:00
|
|
|
// Preserve the trailing slash
|
|
|
|
if strings.HasSuffix(dest, string(os.PathSeparator)) || dest == "." {
|
|
|
|
destPath = destPath + string(os.PathSeparator)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
destStat, err := os.Stat(destPath)
|
|
|
|
if err != nil {
|
|
|
|
if !os.IsNotExist(err) {
|
2015-07-12 12:05:10 -04:00
|
|
|
logrus.Errorf("Error performing os.Stat on %s. %s", destPath, err)
|
2014-08-05 18:41:09 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
destExists = false
|
|
|
|
}
|
|
|
|
|
|
|
|
fi, err := os.Stat(origPath)
|
|
|
|
if err != nil {
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return fmt.Errorf("%s: no such file or directory", orig)
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if fi.IsDir() {
|
2014-12-11 13:40:16 -05:00
|
|
|
return copyAsDirectory(origPath, destPath, destExists)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// If we are adding a remote file (or we've been told not to decompress), do not try to untar it
|
|
|
|
if decompress {
|
|
|
|
// 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
|
2015-07-12 12:05:10 -04:00
|
|
|
// filename from the path but this is only added if it does not end in slash
|
2014-08-05 18:41:09 -04:00
|
|
|
tarDest := destPath
|
2015-07-12 12:05:10 -04:00
|
|
|
if strings.HasSuffix(tarDest, string(os.PathSeparator)) {
|
2014-08-05 18:41:09 -04:00
|
|
|
tarDest = filepath.Dir(destPath)
|
|
|
|
}
|
|
|
|
|
|
|
|
// try to successfully untar the orig
|
2014-10-29 15:06:51 -04:00
|
|
|
if err := chrootarchive.UntarPath(origPath, tarDest); err == nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
return nil
|
|
|
|
} else if err != io.EOF {
|
2015-03-26 18:22:04 -04:00
|
|
|
logrus.Debugf("Couldn't untar %s to %s: %s", origPath, tarDest, err)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-07 11:39:42 -04:00
|
|
|
if err := system.MkdirAll(filepath.Dir(destPath), 0755); err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
return err
|
|
|
|
}
|
2014-10-29 15:06:51 -04:00
|
|
|
if err := chrootarchive.CopyWithTar(origPath, destPath); err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
resPath := destPath
|
|
|
|
if destExists && destStat.IsDir() {
|
2015-05-07 11:39:42 -04:00
|
|
|
resPath = filepath.Join(destPath, filepath.Base(origPath))
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2014-12-11 13:40:16 -05:00
|
|
|
return fixPermissions(origPath, resPath, 0, 0, destExists)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2014-12-11 13:40:16 -05:00
|
|
|
func copyAsDirectory(source, destination string, destExisted bool) error {
|
2014-10-29 15:06:51 -04:00
|
|
|
if err := chrootarchive.CopyWithTar(source, destination); err != nil {
|
2014-08-05 18:41:09 -04:00
|
|
|
return err
|
|
|
|
}
|
2014-12-11 13:40:16 -05:00
|
|
|
return fixPermissions(source, destination, 0, 0, destExisted)
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
|
2015-07-22 01:29:03 -04:00
|
|
|
func (b *builder) clearTmp() {
|
2014-08-19 07:14:21 -04:00
|
|
|
for c := range b.TmpContainers {
|
2015-05-26 15:38:52 -04:00
|
|
|
rmConfig := &daemon.ContainerRmConfig{
|
|
|
|
ForceRemove: true,
|
|
|
|
RemoveVolume: true,
|
2014-12-16 18:06:35 -05:00
|
|
|
}
|
2015-05-26 15:38:52 -04:00
|
|
|
if err := b.Daemon.ContainerRm(c, rmConfig); err != nil {
|
2015-03-24 07:25:26 -04:00
|
|
|
fmt.Fprintf(b.OutStream, "Error removing intermediate container %s: %v\n", stringid.TruncateID(c), err)
|
2014-08-28 10:18:08 -04:00
|
|
|
return
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
2014-08-28 10:18:08 -04:00
|
|
|
delete(b.TmpContainers, c)
|
2015-03-24 07:25:26 -04:00
|
|
|
fmt.Fprintf(b.OutStream, "Removing intermediate container %s\n", stringid.TruncateID(c))
|
2014-08-05 18:41:09 -04:00
|
|
|
}
|
|
|
|
}
|