github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-14 01:57:32 +08:00
Code Issues Releases Wiki Activity

Allow to specify image new when creating instances (#84)

Browse Source
This commit is contained in:
Marcos Nils 2017-04-11 14:01:15 -03:00 committed by GitHub
parent 35775c2083
commit c511737136
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/new_instance.go
View File

@ -13,6 +13,10 @@ func NewInstance(rw http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req) vars := mux.Vars(req)
sessionId := vars["sessionId"] sessionId := vars["sessionId"]
body := struct{ ImageName string }{}
json.NewDecoder(req.Body).Decode(&body)
s := services.GetSession(sessionId) s := services.GetSession(sessionId)
s.Lock() s.Lock()
@ -22,7 +26,7 @@ func NewInstance(rw http.ResponseWriter, req *http.Request) {
return return
} }
i, err := services.NewInstance(s) i, err := services.NewInstance(s, body.ImageName)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
rw.WriteHeader(http.StatusInternalServerError) rw.WriteHeader(http.StatusInternalServerError)

7
services/instance.go
View File

@ -91,8 +91,11 @@ func getDindImageName() string {
return dindImage return dindImage
} }
func NewInstance(session *Session) (*Instance, error) { func NewInstance(session *Session, imageName string) (*Instance, error) {
log.Printf("NewInstance - using image: [%s]\n", dindImage) if imageName == "" {
imageName = dindImage
}
log.Printf("NewInstance - using image: [%s]\n", imageName)
instance, err := CreateInstance(session, dindImage) instance, err := CreateInstance(session, dindImage)
if err != nil { if err != nil {
return nil, err return nil, err