Signed-off-by: Antonio Murdaca <me@runcom.ninja>
| ... | ... |
@@ -351,10 +351,24 @@ func getContainersChanges(eng *engine.Engine, version version.Version, w http.Re |
| 351 | 351 |
if vars == nil {
|
| 352 | 352 |
return fmt.Errorf("Missing parameter")
|
| 353 | 353 |
} |
| 354 |
- var job = eng.Job("container_changes", vars["name"])
|
|
| 355 |
- streamJSON(job, w, false) |
|
| 356 | 354 |
|
| 357 |
- return job.Run() |
|
| 355 |
+ name := vars["name"] |
|
| 356 |
+ if name == "" {
|
|
| 357 |
+ return fmt.Errorf("Container name cannot be empty")
|
|
| 358 |
+ } |
|
| 359 |
+ |
|
| 360 |
+ d := getDaemon(eng) |
|
| 361 |
+ cont, err := d.Get(name) |
|
| 362 |
+ if err != nil {
|
|
| 363 |
+ return err |
|
| 364 |
+ } |
|
| 365 |
+ |
|
| 366 |
+ changes, err := cont.Changes() |
|
| 367 |
+ if err != nil {
|
|
| 368 |
+ return err |
|
| 369 |
+ } |
|
| 370 |
+ |
|
| 371 |
+ return writeJSON(w, http.StatusOK, changes) |
|
| 358 | 372 |
} |
| 359 | 373 |
|
| 360 | 374 |
func getContainersTop(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
| 361 | 375 |
deleted file mode 100644 |
| ... | ... |
@@ -1,31 +0,0 @@ |
| 1 |
-package daemon |
|
| 2 |
- |
|
| 3 |
-import ( |
|
| 4 |
- "encoding/json" |
|
| 5 |
- "fmt" |
|
| 6 |
- |
|
| 7 |
- "github.com/docker/docker/engine" |
|
| 8 |
-) |
|
| 9 |
- |
|
| 10 |
-func (daemon *Daemon) ContainerChanges(job *engine.Job) error {
|
|
| 11 |
- if n := len(job.Args); n != 1 {
|
|
| 12 |
- return fmt.Errorf("Usage: %s CONTAINER", job.Name)
|
|
| 13 |
- } |
|
| 14 |
- name := job.Args[0] |
|
| 15 |
- |
|
| 16 |
- container, err := daemon.Get(name) |
|
| 17 |
- if err != nil {
|
|
| 18 |
- return err |
|
| 19 |
- } |
|
| 20 |
- |
|
| 21 |
- changes, err := container.Changes() |
|
| 22 |
- if err != nil {
|
|
| 23 |
- return err |
|
| 24 |
- } |
|
| 25 |
- |
|
| 26 |
- if err = json.NewEncoder(job.Stdout).Encode(changes); err != nil {
|
|
| 27 |
- return err |
|
| 28 |
- } |
|
| 29 |
- |
|
| 30 |
- return nil |
|
| 31 |
-} |
| ... | ... |
@@ -116,7 +116,6 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
|
| 116 | 116 |
// FIXME: remove ImageDelete's dependency on Daemon, then move to graph/ |
| 117 | 117 |
for name, method := range map[string]engine.Handler{
|
| 118 | 118 |
"commit": daemon.ContainerCommit, |
| 119 |
- "container_changes": daemon.ContainerChanges, |
|
| 120 | 119 |
"container_copy": daemon.ContainerCopy, |
| 121 | 120 |
"container_rename": daemon.ContainerRename, |
| 122 | 121 |
"container_inspect": daemon.ContainerInspect, |