Bip support for docker

This commit is contained in:
Kirilll Zaycev 2015-11-28 00:27:01 +03:00
parent 0b2faea192
commit cd124c3ac5

View File

@ -32,6 +32,7 @@ type Docker struct {
Tag StrSlice `json:"tag"` Tag StrSlice `json:"tag"`
File string `json:"file"` File string `json:"file"`
Context string `json:"context"` Context string `json:"context"`
Bip string `json:"bip"`
Dns []string `json:"dns"` Dns []string `json:"dns"`
Load string `json:"load"` Load string `json:"load"`
Save Save `json:"save"` Save Save `json:"save"`
@ -72,13 +73,13 @@ func main() {
} }
// Get absolute path for 'save' file // Get absolute path for 'save' file
if len(vargs.Save.File) != 0 { if len(vargs.Save.File) != 0 {
if ! filepath.IsAbs(vargs.Save.File) { if !filepath.IsAbs(vargs.Save.File) {
vargs.Save.File = filepath.Join(workspace.Path, vargs.Save.File) vargs.Save.File = filepath.Join(workspace.Path, vargs.Save.File)
} }
} }
// Get absolute path for 'load' file // Get absolute path for 'load' file
if len(vargs.Load) != 0 { if len(vargs.Load) != 0 {
if ! filepath.IsAbs(vargs.Load) { if !filepath.IsAbs(vargs.Load) {
vargs.Load = filepath.Join(workspace.Path, vargs.Load) vargs.Load = filepath.Join(workspace.Path, vargs.Load)
} }
} }
@ -95,6 +96,9 @@ func main() {
if len(vargs.Mirror) != 0 { if len(vargs.Mirror) != 0 {
args = append(args, "--registry-mirror", vargs.Mirror) args = append(args, "--registry-mirror", vargs.Mirror)
} }
if len(vargs.Bip) != 0 {
args = append(args, "--bip", vargs.Bip)
}
for _, value := range vargs.Dns { for _, value := range vargs.Dns {
args = append(args, "--dns", value) args = append(args, "--dns", value)