add namespace for image

Author: tonicmuroq

README.md

@@ -90,6 +90,7 @@ docker:
     network_mode: "bridge" # 默认网络模式, 用 bridge
     cert_path: "[cert_file_dir]" # docker tls 证书目录
     hub: "hub.ricebook.net" # docker hub 地址
+    hub_prefix: "namespace/test" # 存放镜像的命名空间, 两边的/会被去掉, 中间的会保留. 镜像名字会是$hub/$hub_prefix/appname:version
 
 scheduler:
     lock_key: "_scheduler_lock" # scheduler 用的锁的 key, 会在 etcd_lock_prefix 里面
@@ -110,8 +111,3 @@ $ export ERU_CONFIG_PATH=/path/to/core.yaml
 $ export ERU_LOG_LEVEL=DEBUG
 $ core
 ```
-
-## TODO
-
-- [x] more complicated scheduler
-- [x] networks, either use eru-agent or use docker plugin, the latter one is preferred

cluster/calcium/build_image.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"text/template"
 
 	log "github.com/Sirupsen/logrus"
@@ -150,7 +151,7 @@ func (c *calcium) BuildImage(repository, version, uid, artifact string) (chan *t
 	}
 
 	// tag of image, later this will be used to push image to hub
-	tag := fmt.Sprintf("%s/%s:%s", c.config.Docker.Hub, specs.Appname, utils.TruncateID(version))
+	tag := createImageTag(c.config, specs.Appname, utils.TruncateID(version))
 
 	// create tar stream for Build API
 	buildContext, err := createTarStream(buildDir)
@@ -295,3 +296,13 @@ func createDockerfile(buildDir, uid, reponame string, specs types.Specs) error {
 	}
 	return nil
 }
+
+// Image tag
+// 格式严格按照 Hub/HubPrefix/appname:version 来
+func createImageTag(config types.Config, appname, version string) string {
+	prefix := strings.Trim(config.Docker.HubPrefix, "/")
+	if prefix == "" {
+		return fmt.Sprintf("%s/%s:%s", config.Docker.Hub, appname, version)
+	}
+	return fmt.Sprintf("%s/%s/%s:%s", config.Docker.Hub, prefix, appname, version)
+}

core.yaml.sample

@@ -17,6 +17,7 @@ docker:
     network_mode: "bridge"
     cert_path: ""
     hub: "hub.ricebook.net"
+    hub_prefix: ""
 
 scheduler:
     lock_key: "_scheduler_lock"

types/config.go

@@ -25,6 +25,7 @@ type DockerConfig struct {
 	NetworkMode string `yaml:"network_mode"` // docker network mode
 	CertPath    string `yaml:"cert_path"`    // docker cert files path
 	Hub         string `yaml:"hub"`          // docker hub address
+	HubPrefix   string `yaml:"hub_prefix"`   // docker hub prefix, will be set to $Hub/$HubPrefix/$appname
 }
 
 type SchedConfig struct {