Merge branch 'entrypoint' into 'master'

你们的幺蛾子啊害我要改这个

entrypoint 可以写 `after_start: "curl 127.0.0.1:7001"` 之类的, 不验证运行结果; `before_stop: "curl -XPOST localhost:8818/rabbitmq/consumer.stop"`之类的, 同样不验证运行结果, 当做 hook 用吧.

@platform

See merge request !30

Author: CMGS

cluster/calcium/cluster.go

@@ -20,6 +20,11 @@ type calcium struct {
 	source    source.Source
 }
 
+const (
+	AFTER_START = "after_start"
+	BEFORE_STOP = "before_stop"
+)
+
 func New(config types.Config) (*calcium, error) {
 	var err error
 	store, err := etcdstore.New(config)

cluster/calcium/create_container.go

@@ -163,6 +163,9 @@ func (c *calcium) doCreateContainerWithCPUPeriod(nodename string, connum int, qu
 			continue
 		}
 
+		// after start
+		runExec(node.Engine, info, AFTER_START)
+
 		_, err = c.store.AddContainer(info.ID, opts.Podname, node.Name, containerName, nil, opts.Memory)
 		if err != nil {
 			ms[i].Error = err.Error()
@@ -435,6 +438,9 @@ func (c *calcium) doCreateContainerWithScheduler(nodename string, cpumap []types
 			continue
 		}
 
+		// after start
+		runExec(node.Engine, info, AFTER_START)
+
 		_, err = c.store.AddContainer(info.ID, opts.Podname, node.Name, containerName, quota, opts.Memory)
 		if err != nil {
 			ms[i].Error = err.Error()
@@ -586,6 +592,10 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
 	if entry.HealthCheck == "tcp" || entry.HealthCheck == "http" {
 		containerLabels["healthcheck"] = entry.HealthCheck
 	}
+	// 要把after_start和before_stop写进去
+	containerLabels[AFTER_START] = entry.AfterStart
+	containerLabels[BEFORE_STOP] = entry.BeforeStop
+	// 接下来是meta
 	for key, value := range specs.Meta {
 		containerLabels[key] = value
 	}
@@ -759,6 +769,9 @@ func (c *calcium) doUpgradeContainer(containers []*types.Container, image string
 		// TODO in the future I hope `makeContainerConfig` will make a deep copy of config
 		imageToDelete := info.Config.Image
 
+		// before stop old container
+		runExec(engine, info, BEFORE_STOP)
+
 		// stops the old container
 		timeout := 5 * time.Second
 		err = engine.ContainerStop(context.Background(), info.ID, &timeout)
@@ -820,6 +833,9 @@ func (c *calcium) doUpgradeContainer(containers []*types.Container, image string
 			continue
 		}
 
+		// after start
+		runExec(engine, newInfo, AFTER_START)
+
 		// if so, add a new container in etcd
 		_, err = c.store.AddContainer(newInfo.ID, container.Podname, container.Nodename, containerName, container.CPU, container.Memory)
 		if err != nil {

cluster/calcium/helper.go

@@ -7,11 +7,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	engineapi "github.com/docker/engine-api/client"
 	enginetypes "github.com/docker/engine-api/types"
 	enginecontainer "github.com/docker/engine-api/types/container"
 	enginenetwork "github.com/docker/engine-api/types/network"
 	"gitlab.ricebook.net/platform/core/types"
 	"gitlab.ricebook.net/platform/core/utils"
+	"golang.org/x/net/context"
 )
 
 // As the name says,
@@ -130,3 +132,20 @@ func makeMountPaths(specs types.Specs, config types.Config) ([]string, map[strin
 	binds = append(binds, "/proc/sys:/writable-proc/sys:ro")
 	return binds, volumes
 }
+
+// 跑存在labels里的exec
+// 为什么要存labels呢, 因为下线容器的时候根本不知道entrypoint是啥
+func runExec(client *engineapi.Client, container enginetypes.ContainerJSON, label string) error {
+	cmd, ok := container.Config.Labels[label]
+	if !ok {
+		return fmt.Errorf("No %q found in container %q", label, container.ID)
+	}
+
+	cmds := utils.MakeCommandLineArgs(cmd)
+	execConfig := enginetypes.ExecConfig{User: container.Config.User, Cmd: cmds}
+	resp, err := client.ContainerExecCreate(context.Background(), container.ID, execConfig)
+	if err != nil {
+		return err
+	}
+	return client.ContainerExecStart(context.Background(), resp.ID, enginetypes.ExecStartCheck{})
+}

cluster/calcium/remove_container.go

@@ -83,6 +83,9 @@ func (c *calcium) removeOneContainer(container *types.Container) error {
 		return err
 	}
 
+	// before stop
+	runExec(container.Engine, info, BEFORE_STOP)
+
 	timeout := 5 * time.Second
 	err = container.Engine.ContainerStop(context.Background(), info.ID, &timeout)
 	if err != nil {

types/specs.go

@@ -23,6 +23,8 @@ type Specs struct {
 // single entrypoint
 type Entrypoint struct {
 	Command       string   `yaml:"cmd,omitempty"`
+	AfterStart    string   `yaml:"after_start,omitempty"`
+	BeforeStop    string   `yaml:"before_stop,omitempty"`
 	Ports         []Port   `yaml:"ports,omitempty,flow"`
 	Exposes       []Expose `yaml:"exposes,omitempty,flow"`
 	NetworkMode   string   `yaml:"network_mode,omitempty"`