Browse code
Put back the github.com path for the import
creack authored on 2013/03/13 03:59:27Showing 13 changed files
- client/client.go
- container.go
- container_test.go
- docker.go
- docker/docker.go
- docker_test.go
- dockerd/dockerd.go
- fs/layers.go
- fs/layers_test.go
- fs/store.go
- fs/store_test.go
- server/server.go
- state.go
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
package server |
| 2 | 2 |
|
| 3 | 3 |
import ( |
| 4 |
- ".." |
|
| 5 |
- "../fs" |
|
| 6 |
- "../future" |
|
| 7 |
- "../rcli" |
|
| 8 | 4 |
"bufio" |
| 9 | 5 |
"bytes" |
| 10 | 6 |
"encoding/json" |
| 11 | 7 |
"errors" |
| 12 | 8 |
"fmt" |
| 9 |
+ "github.com/dotcloud/docker" |
|
| 10 |
+ "github.com/dotcloud/docker/fs" |
|
| 11 |
+ "github.com/dotcloud/docker/future" |
|
| 12 |
+ "github.com/dotcloud/docker/rcli" |
|
| 13 | 13 |
"io" |
| 14 | 14 |
"net/http" |
| 15 | 15 |
"net/url" |
| ... | ... |
@@ -60,8 +60,6 @@ func (srv *Server) Help() string {
|
| 60 | 60 |
{"mirror", "(debug only) (No documentation available)"},
|
| 61 | 61 |
{"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"},
|
| 62 | 62 |
{"ps", "List containers"},
|
| 63 |
- {"pull", "Download a new image from a remote location"},
|
|
| 64 |
- {"put", "Import a new image from a local archive"},
|
|
| 65 | 63 |
{"reset", "Reset changes to a container's filesystem"},
|
| 66 | 64 |
{"restart", "Restart a running container"},
|
| 67 | 65 |
{"rm", "Remove a container"},
|