Skip to content

Merge the criu branch, and the swrk branch, and add support for more criu options #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boucher wants to merge 16 commits into
base: libcontainer-master
Choose a base branch
from
Open

Merge the criu branch, and the swrk branch, and add support for more criu options #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8618221
Add Checkpoint and Restore methods to Container
crosbymichael Mar 6, 2015
ef80134
Add nsinit support for checkpoint and restore
crosbymichael Mar 6, 2015
76478b6
Update criu support with restored processes
crosbymichael Mar 13, 2015
ebffd3b
Set default criu binary
crosbymichael Mar 13, 2015
9e7e1c5
Some C/R bug fixes and changes in the new libcontainer and nsinit.
Mar 19, 2015
cc60fc4
go: fmt
avagin Mar 25, 2015
a091143
cr: don't umount rootfs which was not mounted by us
avagin Mar 25, 2015
86593b8
cr: wait the criu process properly
avagin Mar 25, 2015
d9c349d
ct: execute CRIU restore with the --restore-detached option
avagin Mar 26, 2015
1154116
vendor: add protobuf
avagin Mar 30, 2015
fd0c87f
cr: add criu_rpc.proto
avagin Mar 27, 2015
e5ed16c
cr: use the RPC protocol for communication with criu
avagin Mar 26, 2015
003d471
cr: check criu version
avagin Apr 1, 2015
a0d32b9
cr: split work and image directories
avagin Apr 2, 2015
bdd349b
Dockerfile: don't call go get
avagin Apr 6, 2015
7ab4fa0
Add support for criu options
boucher Apr 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ COPY . /go/src/github.com/docker/libcontainer
WORKDIR /go/src/github.com/docker/libcontainer
RUN cp sample_configs/minimal.json /busybox/container.json

RUN go get -d -v ./...
RUN make direct-install

ENTRYPOINT ["/dind"]
Expand Down
3 changes: 3 additions & 0 deletions configs/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ type Config struct {
// ReadonlyPaths specifies paths within the container's rootfs to remount as read-only
// so that these files prevent any writes.
ReadonlyPaths []string `json:"readonly_paths"`

// Container's standard descriptors (std{in,out,err}), needed for checkpoint and restore
StdFds [3]string `json:"ext_pipes,omitempty"`
}

// Gets the root uid for the process on host which could be non-zero
Expand Down
12 changes: 12 additions & 0 deletions container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,18 @@ type Container interface {
// Systemerror - System error.
Start(process *Process) (err error)

// Checkpoint checkpoints the running container's state to disk using the criu(8) utility.
//
// errors:
// Systemerror - System error.
Checkpoint(criuOpts *CriuOpts) error

// Restore restores the checkpointed container to a running state using the criu(8) utiity.
//
// errors:
// Systemerror - System error.
Restore(p *Process, criuOpts *CriuOpts) error

// Destroys the container after killing all running processes.
//
// Any event registrations are removed before the container is destroyed.
Expand Down
Loading