2013-04-24 14:03:01 -04:00
|
|
|
package docker
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bufio"
|
2013-05-02 06:00:56 -04:00
|
|
|
"encoding/json"
|
2013-04-24 14:03:01 -04:00
|
|
|
"fmt"
|
|
|
|
"io"
|
2013-04-24 18:14:10 -04:00
|
|
|
"os"
|
|
|
|
"path"
|
2013-04-24 14:03:01 -04:00
|
|
|
"strings"
|
2013-04-24 18:14:10 -04:00
|
|
|
"time"
|
2013-04-24 14:03:01 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
type Builder struct {
|
2013-04-24 18:14:10 -04:00
|
|
|
runtime *Runtime
|
|
|
|
repositories *TagStore
|
2013-05-06 19:58:09 -04:00
|
|
|
graph *Graph
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func NewBuilder(runtime *Runtime) *Builder {
|
|
|
|
return &Builder{
|
2013-04-24 18:14:10 -04:00
|
|
|
runtime: runtime,
|
2013-05-06 19:58:09 -04:00
|
|
|
graph: runtime.graph,
|
2013-04-24 18:14:10 -04:00
|
|
|
repositories: runtime.repositories,
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-01 17:36:45 -04:00
|
|
|
func (builder *Builder) mergeConfig(userConf, imageConf *Config) {
|
|
|
|
if userConf.Hostname != "" {
|
|
|
|
userConf.Hostname = imageConf.Hostname
|
|
|
|
}
|
|
|
|
if userConf.User != "" {
|
|
|
|
userConf.User = imageConf.User
|
|
|
|
}
|
|
|
|
if userConf.Memory == 0 {
|
|
|
|
userConf.Memory = imageConf.Memory
|
|
|
|
}
|
|
|
|
if userConf.MemorySwap == 0 {
|
|
|
|
userConf.MemorySwap = imageConf.MemorySwap
|
|
|
|
}
|
|
|
|
if userConf.PortSpecs == nil || len(userConf.PortSpecs) == 0 {
|
|
|
|
userConf.PortSpecs = imageConf.PortSpecs
|
|
|
|
}
|
|
|
|
if !userConf.Tty {
|
|
|
|
userConf.Tty = userConf.Tty
|
|
|
|
}
|
|
|
|
if !userConf.OpenStdin {
|
|
|
|
userConf.OpenStdin = imageConf.OpenStdin
|
|
|
|
}
|
|
|
|
if !userConf.StdinOnce {
|
|
|
|
userConf.StdinOnce = imageConf.StdinOnce
|
|
|
|
}
|
|
|
|
if userConf.Env == nil || len(userConf.Env) == 0 {
|
|
|
|
userConf.Env = imageConf.Env
|
|
|
|
}
|
|
|
|
if userConf.Cmd == nil || len(userConf.Cmd) == 0 {
|
|
|
|
userConf.Cmd = imageConf.Cmd
|
|
|
|
}
|
|
|
|
if userConf.Dns == nil || len(userConf.Dns) == 0 {
|
|
|
|
userConf.Dns = imageConf.Dns
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
func (builder *Builder) Create(config *Config) (*Container, error) {
|
|
|
|
// Lookup image
|
|
|
|
img, err := builder.repositories.LookupImage(config.Image)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2013-05-01 17:36:45 -04:00
|
|
|
}
|
2013-05-01 17:36:45 -04:00
|
|
|
|
|
|
|
if img.Config != nil {
|
|
|
|
builder.mergeConfig(config, img.Config)
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.Cmd == nil {
|
|
|
|
return nil, fmt.Errorf("No command specified")
|
|
|
|
}
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
// Generate id
|
|
|
|
id := GenerateId()
|
|
|
|
// Generate default hostname
|
|
|
|
// FIXME: the lxc template no longer needs to set a default hostname
|
|
|
|
if config.Hostname == "" {
|
|
|
|
config.Hostname = id[:12]
|
2013-05-01 17:36:45 -04:00
|
|
|
}
|
2013-04-24 18:14:10 -04:00
|
|
|
|
|
|
|
container := &Container{
|
|
|
|
// FIXME: we should generate the ID here instead of receiving it as an argument
|
|
|
|
Id: id,
|
|
|
|
Created: time.Now(),
|
|
|
|
Path: config.Cmd[0],
|
|
|
|
Args: config.Cmd[1:], //FIXME: de-duplicate from config
|
|
|
|
Config: config,
|
|
|
|
Image: img.Id, // Always use the resolved image id
|
|
|
|
NetworkSettings: &NetworkSettings{},
|
|
|
|
// FIXME: do we need to store this in the container?
|
|
|
|
SysInitPath: sysInitPath,
|
|
|
|
}
|
|
|
|
container.root = builder.runtime.containerRoot(container.Id)
|
|
|
|
// Step 1: create the container directory.
|
|
|
|
// This doubles as a barrier to avoid race conditions.
|
|
|
|
if err := os.Mkdir(container.root, 0700); err != nil {
|
|
|
|
return nil, err
|
2013-05-01 17:36:45 -04:00
|
|
|
}
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
// If custom dns exists, then create a resolv.conf for the container
|
|
|
|
if len(config.Dns) > 0 {
|
|
|
|
container.ResolvConfPath = path.Join(container.root, "resolv.conf")
|
|
|
|
f, err := os.Create(container.ResolvConfPath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
for _, dns := range config.Dns {
|
|
|
|
if _, err := f.Write([]byte("nameserver " + dns + "\n")); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
container.ResolvConfPath = "/etc/resolv.conf"
|
|
|
|
}
|
|
|
|
|
|
|
|
// Step 2: save the container json
|
|
|
|
if err := container.ToDisk(); err != nil {
|
2013-04-24 18:14:10 -04:00
|
|
|
return nil, err
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
2013-04-24 18:14:10 -04:00
|
|
|
// Step 3: register the container
|
|
|
|
if err := builder.runtime.Register(container); err != nil {
|
2013-04-24 14:03:01 -04:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return container, nil
|
|
|
|
}
|
|
|
|
|
2013-05-01 17:36:45 -04:00
|
|
|
// Commit creates a new filesystem image from the current state of a container.
|
|
|
|
// The image can optionally be tagged into a repository
|
|
|
|
func (builder *Builder) Commit(container *Container, repository, tag, comment, author string, config *Config) (*Image, error) {
|
|
|
|
// FIXME: freeze the container before copying it to avoid data corruption?
|
|
|
|
// FIXME: this shouldn't be in commands.
|
|
|
|
rwTar, err := container.ExportRw()
|
2013-04-24 18:24:14 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2013-05-01 17:36:45 -04:00
|
|
|
// Create a new image from the container's base layers + a new layer from container changes
|
|
|
|
img, err := builder.graph.Create(rwTar, container, comment, author, config)
|
2013-04-24 18:24:14 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2013-05-06 19:58:09 -04:00
|
|
|
// Register the image if needed
|
|
|
|
if repository != "" {
|
|
|
|
if err := builder.repositories.Set(repository, tag, img.Id, true); err != nil {
|
|
|
|
return img, err
|
|
|
|
}
|
|
|
|
}
|
2013-04-24 18:24:14 -04:00
|
|
|
return img, nil
|
2013-04-24 16:35:57 -04:00
|
|
|
}
|
|
|
|
|
2013-05-02 03:49:23 -04:00
|
|
|
func (builder *Builder) clearTmp(containers, images map[string]struct{}) {
|
|
|
|
for c := range containers {
|
|
|
|
tmp := builder.runtime.Get(c)
|
|
|
|
builder.runtime.Destroy(tmp)
|
|
|
|
Debugf("Removing container %s", c)
|
|
|
|
}
|
|
|
|
for i := range images {
|
|
|
|
builder.runtime.graph.Delete(i)
|
|
|
|
Debugf("Removing image %s", i)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (builder *Builder) getCachedImage(image *Image, config *Config) (*Image, error) {
|
|
|
|
// Retrieve all images
|
|
|
|
images, err := builder.graph.All()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Store the tree in a map of map (map[parentId][childId])
|
|
|
|
imageMap := make(map[string]map[string]struct{})
|
|
|
|
for _, img := range images {
|
|
|
|
if _, exists := imageMap[img.Parent]; !exists {
|
|
|
|
imageMap[img.Parent] = make(map[string]struct{})
|
|
|
|
}
|
|
|
|
imageMap[img.Parent][img.Id] = struct{}{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Loop on the children of the given image and check the config
|
|
|
|
for elem := range imageMap[image.Id] {
|
|
|
|
img, err := builder.graph.Get(elem)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if CompareConfig(&img.ContainerConfig, config) {
|
|
|
|
return img, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, error) {
|
|
|
|
var (
|
|
|
|
image, base *Image
|
2013-05-02 05:51:14 -04:00
|
|
|
config *Config
|
2013-05-02 03:49:23 -04:00
|
|
|
maintainer string
|
2013-05-06 21:39:56 -04:00
|
|
|
env map[string]string = make(map[string]string)
|
2013-05-02 03:49:23 -04:00
|
|
|
tmpContainers map[string]struct{} = make(map[string]struct{})
|
|
|
|
tmpImages map[string]struct{} = make(map[string]struct{})
|
|
|
|
)
|
|
|
|
defer builder.clearTmp(tmpContainers, tmpImages)
|
2013-04-24 14:03:01 -04:00
|
|
|
|
|
|
|
file := bufio.NewReader(dockerfile)
|
|
|
|
for {
|
|
|
|
line, err := file.ReadString('\n')
|
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF {
|
|
|
|
break
|
|
|
|
}
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
2013-05-02 04:18:48 -04:00
|
|
|
line = strings.Replace(strings.TrimSpace(line), " ", " ", 1)
|
2013-04-24 14:03:01 -04:00
|
|
|
// Skip comments and empty line
|
|
|
|
if len(line) == 0 || line[0] == '#' {
|
|
|
|
continue
|
|
|
|
}
|
2013-05-06 19:58:09 -04:00
|
|
|
tmp := strings.SplitN(line, " ", 2)
|
2013-04-24 14:03:01 -04:00
|
|
|
if len(tmp) != 2 {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, fmt.Errorf("Invalid Dockerfile format")
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
2013-05-06 19:58:09 -04:00
|
|
|
instruction := strings.Trim(tmp[0], " ")
|
|
|
|
arguments := strings.Trim(tmp[1], " ")
|
|
|
|
switch strings.ToLower(instruction) {
|
2013-04-24 14:03:01 -04:00
|
|
|
case "from":
|
2013-05-06 19:58:09 -04:00
|
|
|
fmt.Fprintf(stdout, "FROM %s\n", arguments)
|
|
|
|
image, err = builder.runtime.repositories.LookupImage(arguments)
|
2013-04-24 14:03:01 -04:00
|
|
|
if err != nil {
|
2013-05-01 18:06:23 -04:00
|
|
|
if builder.runtime.graph.IsNotExist(err) {
|
2013-05-06 19:40:45 -04:00
|
|
|
|
|
|
|
var tag, remote string
|
2013-05-06 19:58:09 -04:00
|
|
|
if strings.Contains(arguments, ":") {
|
|
|
|
remoteParts := strings.Split(arguments, ":")
|
2013-05-06 19:40:45 -04:00
|
|
|
tag = remoteParts[1]
|
|
|
|
remote = remoteParts[0]
|
2013-05-06 19:58:09 -04:00
|
|
|
} else {
|
|
|
|
remote = arguments
|
2013-05-06 19:40:45 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if err := builder.runtime.graph.PullRepository(stdout, remote, tag, builder.runtime.repositories, builder.runtime.authConfig); err != nil {
|
|
|
|
return nil, err
|
2013-05-01 18:06:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
image, err = builder.runtime.repositories.LookupImage(arguments)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
return nil, err
|
|
|
|
}
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
2013-05-02 05:51:14 -04:00
|
|
|
config = &Config{}
|
2013-05-06 19:58:09 -04:00
|
|
|
|
|
|
|
break
|
2013-05-02 06:58:58 -04:00
|
|
|
case "maintainer":
|
2013-05-06 19:58:09 -04:00
|
|
|
fmt.Fprintf(stdout, "MAINTAINER %s\n", arguments)
|
|
|
|
maintainer = arguments
|
2013-04-24 14:03:01 -04:00
|
|
|
break
|
|
|
|
case "run":
|
2013-05-06 19:58:09 -04:00
|
|
|
fmt.Fprintf(stdout, "RUN %s\n", arguments)
|
2013-04-24 17:28:51 -04:00
|
|
|
if image == nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, fmt.Errorf("Please provide a source image with `from` prior to run")
|
2013-04-24 17:28:51 -04:00
|
|
|
}
|
2013-05-07 13:23:50 -04:00
|
|
|
config, _, err := ParseRun([]string{image.Id, "/bin/sh", "-c", arguments}, builder.runtime.capabilities)
|
2013-04-24 17:28:51 -04:00
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 17:28:51 -04:00
|
|
|
}
|
2013-04-24 18:14:10 -04:00
|
|
|
|
2013-05-06 21:39:56 -04:00
|
|
|
for key, value := range env {
|
|
|
|
config.Env = append(config.Env, fmt.Sprintf("%s=%s", key, value))
|
|
|
|
}
|
|
|
|
|
2013-05-02 03:49:23 -04:00
|
|
|
if cache, err := builder.getCachedImage(image, config); err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if cache != nil {
|
|
|
|
image = cache
|
|
|
|
fmt.Fprintf(stdout, "===> %s\n", image.ShortId())
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
2013-05-06 21:39:56 -04:00
|
|
|
Debugf("Env -----> %v ------ %v\n", config.Env, env)
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
// Create the container and start it
|
|
|
|
c, err := builder.Create(config)
|
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
2013-05-06 21:39:56 -04:00
|
|
|
|
|
|
|
if os.Getenv("DEBUG") != "" {
|
|
|
|
out, _ := c.StdoutPipe()
|
|
|
|
err2, _ := c.StderrPipe()
|
|
|
|
go io.Copy(os.Stdout, out)
|
|
|
|
go io.Copy(os.Stdout, err2)
|
|
|
|
}
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
if err := c.Start(); err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
tmpContainers[c.Id] = struct{}{}
|
|
|
|
|
|
|
|
// Wait for it to finish
|
|
|
|
if result := c.Wait(); result != 0 {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, fmt.Errorf("!!! '%s' return non-zero exit code '%d'. Aborting.", arguments, result)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Commit the container
|
|
|
|
base, err = builder.Commit(c, "", "", "", maintainer, nil)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
tmpImages[base.Id] = struct{}{}
|
|
|
|
|
|
|
|
fmt.Fprintf(stdout, "===> %s\n", base.ShortId())
|
|
|
|
|
|
|
|
// use the base as the new image
|
|
|
|
image = base
|
|
|
|
|
2013-05-06 21:39:56 -04:00
|
|
|
break
|
|
|
|
case "env":
|
|
|
|
tmp := strings.SplitN(arguments, " ", 2)
|
|
|
|
if len(tmp) != 2 {
|
|
|
|
return nil, fmt.Errorf("Invalid ENV format")
|
|
|
|
}
|
|
|
|
key := strings.Trim(tmp[0], " ")
|
|
|
|
value := strings.Trim(tmp[1], " ")
|
|
|
|
fmt.Fprintf(stdout, "ENV %s %s\n", key, value)
|
|
|
|
env[key] = value
|
|
|
|
if image != nil {
|
|
|
|
fmt.Fprintf(stdout, "===> %s\n", image.ShortId())
|
|
|
|
} else {
|
|
|
|
fmt.Fprintf(stdout, "===> <nil>\n")
|
|
|
|
}
|
2013-05-02 06:00:56 -04:00
|
|
|
break
|
|
|
|
case "cmd":
|
|
|
|
fmt.Fprintf(stdout, "CMD %s\n", arguments)
|
|
|
|
|
|
|
|
// Create the container and start it
|
|
|
|
c, err := builder.Create(&Config{Image: image.Id, Cmd: []string{"", ""}})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if err := c.Start(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
tmpContainers[c.Id] = struct{}{}
|
|
|
|
|
|
|
|
cmd := []string{}
|
|
|
|
if err := json.Unmarshal([]byte(arguments), &cmd); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
config.Cmd = cmd
|
|
|
|
|
|
|
|
// Commit the container
|
|
|
|
base, err = builder.Commit(c, "", "", "", maintainer, config)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
tmpImages[base.Id] = struct{}{}
|
|
|
|
|
|
|
|
fmt.Fprintf(stdout, "===> %s\n", base.ShortId())
|
|
|
|
image = base
|
2013-05-06 19:58:09 -04:00
|
|
|
break
|
|
|
|
case "expose":
|
|
|
|
ports := strings.Split(arguments, " ")
|
|
|
|
|
|
|
|
fmt.Fprintf(stdout, "EXPOSE %v\n", ports)
|
|
|
|
if image == nil {
|
|
|
|
return nil, fmt.Errorf("Please provide a source image with `from` prior to copy")
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
|
2013-05-06 19:58:09 -04:00
|
|
|
// Create the container and start it
|
|
|
|
c, err := builder.Create(&Config{Image: image.Id, Cmd: []string{"", ""}})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if err := c.Start(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
tmpContainers[c.Id] = struct{}{}
|
|
|
|
|
2013-05-02 05:51:14 -04:00
|
|
|
config.PortSpecs = append(ports, config.PortSpecs...)
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
// Commit the container
|
2013-05-02 05:51:14 -04:00
|
|
|
base, err = builder.Commit(c, "", "", "", maintainer, config)
|
2013-04-24 18:14:10 -04:00
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
tmpImages[base.Id] = struct{}{}
|
|
|
|
|
|
|
|
fmt.Fprintf(stdout, "===> %s\n", base.ShortId())
|
2013-05-06 19:58:09 -04:00
|
|
|
image = base
|
2013-04-24 17:28:51 -04:00
|
|
|
break
|
2013-05-06 19:58:09 -04:00
|
|
|
case "insert":
|
2013-04-24 18:14:10 -04:00
|
|
|
if image == nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, fmt.Errorf("Please provide a source image with `from` prior to copy")
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
2013-05-06 19:58:09 -04:00
|
|
|
tmp = strings.SplitN(arguments, " ", 2)
|
2013-04-24 18:14:10 -04:00
|
|
|
if len(tmp) != 2 {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, fmt.Errorf("Invalid INSERT format")
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
2013-05-06 19:58:09 -04:00
|
|
|
sourceUrl := strings.Trim(tmp[0], " ")
|
|
|
|
destPath := strings.Trim(tmp[1], " ")
|
|
|
|
fmt.Fprintf(stdout, "COPY %s to %s in %s\n", sourceUrl, destPath, base.ShortId())
|
2013-04-24 18:14:10 -04:00
|
|
|
|
2013-05-06 19:58:09 -04:00
|
|
|
file, err := Download(sourceUrl, stdout)
|
2013-04-24 18:14:10 -04:00
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
defer file.Body.Close()
|
|
|
|
|
2013-05-07 13:23:50 -04:00
|
|
|
config, _, err := ParseRun([]string{base.Id, "echo", "insert", sourceUrl, destPath}, builder.runtime.capabilities)
|
2013-04-24 18:14:10 -04:00
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
c, err := builder.Create(config)
|
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if err := c.Start(); err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Wait for echo to finish
|
|
|
|
if result := c.Wait(); result != 0 {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, fmt.Errorf("!!! '%s' return non-zero exit code '%d'. Aborting.", arguments, result)
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
|
2013-05-06 19:58:09 -04:00
|
|
|
if err := c.Inject(file.Body, destPath); err != nil {
|
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
|
2013-05-06 19:58:09 -04:00
|
|
|
base, err = builder.Commit(c, "", "", "", maintainer, nil)
|
2013-04-24 18:14:10 -04:00
|
|
|
if err != nil {
|
2013-05-06 19:58:09 -04:00
|
|
|
return nil, err
|
2013-04-24 18:14:10 -04:00
|
|
|
}
|
|
|
|
fmt.Fprintf(stdout, "===> %s\n", base.ShortId())
|
2013-05-06 19:58:09 -04:00
|
|
|
|
|
|
|
image = base
|
|
|
|
|
2013-04-24 18:14:10 -04:00
|
|
|
break
|
2013-04-24 14:03:01 -04:00
|
|
|
default:
|
2013-05-02 04:18:48 -04:00
|
|
|
fmt.Fprintf(stdout, "Skipping unknown instruction %s\n", strings.ToUpper(instruction))
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
|
|
|
}
|
2013-05-02 03:49:23 -04:00
|
|
|
if image != nil {
|
|
|
|
// The build is successful, keep the temporary containers and images
|
|
|
|
for i := range tmpImages {
|
|
|
|
delete(tmpImages, i)
|
|
|
|
}
|
|
|
|
for i := range tmpContainers {
|
|
|
|
delete(tmpContainers, i)
|
|
|
|
}
|
|
|
|
fmt.Fprintf(stdout, "Build finished. image id: %s\n", image.ShortId())
|
|
|
|
return image, nil
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|
2013-05-02 03:49:23 -04:00
|
|
|
return nil, fmt.Errorf("An error occured during the build\n")
|
2013-04-24 14:03:01 -04:00
|
|
|
}
|