vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Improve process addition and removal

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

implement pause and resume

Add godeps

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add readme

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2015-11-12 13:40:23 -08:00
parent 17d9c10e2d
commit f9ad7970d2
397 changed files with 48104 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
api/v1/server.go
View file

@ -7,7 +7,7 @@ import (
"syscall"
"github.com/Sirupsen/logrus"
"github.com/crosbymichael/containerd"
"github.com/docker/containerd"
"github.com/gorilla/mux"
"github.com/opencontainers/specs"
)
@ -18,9 +18,14 @@ func NewServer(supervisor *containerd.Supervisor) http.Handler {
supervisor: supervisor,
r: r,
}
// TODO: add container stats
// TODO: add container checkpoint
// TODO: add container restore
// TODO: set prctl child subreaper
r.HandleFunc("/containers/{id:.*}/process/{pid:.*}", s.signalPid).Methods("POST")
r.HandleFunc("/containers/{id:.*}/process", s.addProcess).Methods("PUT")
r.HandleFunc("/containers/{id:.*}", s.createContainer).Methods("POST")
r.HandleFunc("/containers/{id:.*}", s.updateContainer).Methods("PATCH")
r.HandleFunc("/event", s.event).Methods("POST")
r.HandleFunc("/containers", s.containers).Methods("GET")
return s
@ -31,10 +36,30 @@ type server struct {
supervisor *containerd.Supervisor
}
// TODO: implement correct shutdown
func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
s.r.ServeHTTP(w, r)
}
func (s *server) updateContainer(w http.ResponseWriter, r *http.Request) {
id := mux.Vars(r)["id"]
var state ContainerState
if err := json.NewDecoder(r.Body).Decode(&state); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
e := containerd.NewEvent(containerd.UpdateContainerEventType)
e.ID = id
e.State = &containerd.State{
Status: containerd.Status(string(state.Status)),
}
s.supervisor.SendEvent(e)
if err := <-e.Err; err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
}
func (s *server) event(w http.ResponseWriter, r *http.Request) {
var e containerd.Event
if err := json.NewDecoder(r.Body).Decode(&e); err != nil {
@ -151,6 +176,9 @@ func writeContainers(w http.ResponseWriter, e *containerd.Event) error {
ID: c.ID(),
BundlePath: c.Path(),
Processes: pids,
State: &ContainerState{
Status: Status(c.State().Status),
},
})
}
return json.NewEncoder(w).Encode(&state)