rtyler
/
containerd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
687 Commits 8 Branches 22 Tags 37 MiB
Commit Graph

687 Commits

Author SHA1 Message Date
R. Tyler Croy 00a99efb9f Merge pull request #6 from kris-nova/patch-epoll-freebsd 
Patching epoll implementation on FreeBSD with linux API
 2017-09-05 17:22:00 -07:00
Kris Nova 12f0ffd87f Patching epoll implementation on FreeBSD with linux API 2017-09-06 08:20:44 +08:00
R. Tyler Croy 9261afa61b Merge pull request #5 from kris-nova/cflags-recursion-patch 
Use lazy assign bash var
 2017-09-05 16:04:48 -07:00
Kris Nova 4712c1b4f4 Use lazy assign bash var 2017-09-06 07:03:47 +08:00
freebsdfrau 44057c7044 Merge pull request #4 from kris-nova/compile-patch-freebsd-docker-kris-nova 
Patch for getting docker compiling on FreeBSD 11.1
 2017-09-05 15:54:02 -07:00
Kris Nova f40fcd6ebe Here be dragons 2017-09-06 06:49:06 +08:00
Kris Nova ca2e851d87 Getting FreeBSD Compiling 2017-09-06 06:35:07 +08:00
R. Tyler Croy 2c1089e6ec Begin supporting FreeBSD with a v0.2.9 variant of containerd 2017-09-06 03:33:37 +08:00
Michael Crosby cfb82a876e Merge pull request #930 from runcom/ignore-sigpipe-dockerd 
[v0.2.x] containerd: ignore SIGPIPE
 2017-05-30 09:13:03 -07:00
Antonio Murdaca 2c1d2e24f4
containerd: ignore SIGPIPE 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-27 15:33:12 +02:00
Kenfe-Mickaël Laventure 586d572030 Merge pull request #706 from FengtuWang/correct_govet 
Correct 'go vet' errors
 2017-05-22 07:20:34 -07:00
Kenfe-Mickaël Laventure dbe1bddb66 Merge pull request #872 from keloyang/shim-kill 
Fix close a nil chan err
 2017-05-19 08:28:26 -07:00
yangshukui de0e943db4 Fix close a nil chan err 
If docker exec to a container, and then kill the runtime's shim process
it will close a nil chan in Supervisor' execExit interface.

Supervisor.exit
            |---> s.delete
            |         |
            |         V
            |     execMap := s.getDeleteExecSyncMap(t.ID) make getExecSyncChannel return nil
            |
            |--->s.execExit
            |         |
            |         V
            |     synCh := s.getExecSyncChannel(t.ID, t.PID)
            |         |
            |         V
            |     close(synCh) close a nil chan make container panic

Signed-off-by: yangshukui <yangshukui@huawei.com>
 2017-05-18 19:29:34 +08:00
Kenfe-Mickaël Laventure 9d06c06cb9 Merge pull request #855 from lichao-mobanche/patch-1 
add syscall.EPOLL_CLOEXEC
 2017-05-15 10:38:33 -07:00
lichao-mobanche 2b08c55175 add syscall.EPOLL_CLOEXEC 
fix the epoll fd leak
 2017-05-15 08:55:02 +08:00
Michael Crosby 3addd84065 Merge pull request #828 from x1022as/no-proc 
remove container stat dir when no process found in restore
 2017-05-10 09:57:06 -07:00
Fengtu Wang 649cdd1afc Correct 'go vet' errors 
Use command 'go vet' to find errors:
```
go vet ./...
```
Correct all errors except these in vendor dir.

Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
 2017-05-10 18:31:03 +08:00
Deng Guangxing 6feebe9419 remove container stat dir when no process found in restore 
Under some abnormal cases, container state dir exist while pid file not.
containerd restore would print this error to log without handling this,
it will set container state to stopped without removing its state dir.

trying to start the container again will cause error:
`mkdir /var/run/docker/libcontainerd/containerd/xxx: file exists`

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2017-05-10 12:08:03 +08:00
Phil Estes 8ef7df5797 Merge pull request #827 from crosbymichael/update-console 
Update go-runc and console packages
 2017-05-09 18:06:48 -05:00
Michael Crosby 1494d8f3b8 Update go-runc and console packages 
This fixes an issue in the console package with width and height swapped
when making the ioctls.

It also updates the packages to point to their new location under the
containerd org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-09 15:52:54 -07:00
Qiang Huang d24f39e203 Merge pull request #778 from crosbymichael/runc-master 
Update to runc master(rc5) for v0.2.x branch
 2017-05-04 09:40:54 +08:00
Michael Crosby 25d16dd2e4 update travis runc commit 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-03 14:52:25 -07:00
Michael Crosby a79e9912b1 close channel outside of else block 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-03 14:22:54 -07:00
Michael Crosby 03b3b7e8cc Update to lastest runc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-03 14:00:55 -07:00
Michael Crosby 731702b72a Close stdin after copy returns 
Make sure we close stdin after the copy returns so that containers that
issue a CloseStdin exit and all the io is closed when the write side of
the fifo is closed.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-03 13:48:08 -07:00
Michael Crosby d10daaf8f7 Sync receive console with io copy routines 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-03 13:47:25 -07:00
Michael Crosby a34bc2b1b9 Update containerd with temp console path 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-01 16:43:10 -07:00
Michael Crosby d0b84ced9b Update integration tests for new spec changes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 14:27:21 -07:00
Michael Crosby b9c50a50e9 Update runc to b6b70e53451794e8333e9b602cc096b47a20bd0f 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 14:13:35 -07:00
Michael Crosby 24d74f8dd0 Update codegangsta to urfave cli package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 13:28:31 -07:00
Michael Crosby eeff02a425 Update from codegangsta to urfave 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 13:26:00 -07:00
Michael Crosby d47b9efd90 Update vendor for go-runc and console 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 13:25:18 -07:00
Michael Crosby 740005a298 Update containerd for runc rc5 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 13:22:10 -07:00
Michael Crosby ed07f98790 Merge pull request #763 from keloyang/cleanup-residue 
kill the runtime process if the bundle is not exist
 2017-04-26 10:55:23 -07:00
yangshukui 0581e02fee Kill shim on restore if the bundle dir is missing 
Some anomalies due to the reboot of containerd(killed by docker daemon),
can lead to docker-containerd-shim residue and shim process will not exit
except you kill it manually.

Signed-off-by: yangshukui <yangshukui@huawei.com>
 2017-04-26 13:56:49 +08:00
Michael Crosby f1a935cd20 Merge pull request #764 from mlaventure/delay-io-closure-until-exit 
Delay io closure until process exit
 2017-04-25 09:09:50 -07:00
Kenfe-Mickael Laventure fbc69f71a1 Add travis support for branch v0.2.x 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-24 18:18:15 -07:00
Kenfe-Mickael Laventure 345c9f2b37 Delay io closure until process exit 
This helps ensuring that a client reconnecting to the FIFOs won't get stuck
if the container process happenned to have close both its stdout and stderr
descriptors.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-24 14:55:08 -07:00
Michael Crosby a47bf53545 Merge pull request #726 from darkowlzz/add-pidsLimit 
api.proto: Add pidsLimit
 2017-04-14 10:05:35 -07:00
Sunny 91525bfcae api.proto: Add pidsLimit 
pidsLimit is required to enable updating PidsLimit of containers.
Also, updated runtime Resources, UpdateResources and ctr with pidsLimit.

Signed-off-by: Sunny Gogoi <indiasuny000@gmail.com>
 2017-04-13 21:16:44 +00:00
Michael Crosby 0890045a3c Merge pull request #738 from mlaventure/v0.2.x-update-import-path 
V0.2.x update import path
 2017-04-13 13:28:48 -07:00
Kenfe-Mickael Laventure 72d76f92cc Use a git that supports worktree in Dockerfile 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-13 12:00:23 -07:00
Kenfe-Mickael Laventure 11fcd5d511 Move to go 1.8.1 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-13 11:59:12 -07:00
Kenfe-Mickael Laventure 793b73880e Update import path to use containerd/containerd instead of docker/docker 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-13 11:58:06 -07:00
Michael Crosby f58940c45a Merge pull request #399 from datawolf/replace-range-map 
Refactor enum map range to slice range
 2017-04-06 10:54:49 -07:00
Kenfe-Mickaël Laventure 9048e5e507 Merge pull request #657 from krasi-georgiev/unique-id-name-for-restore-sheckpoints 
add nanoseconds to the filename for the checkoints create and restorе filenames to avoid naming collision.
 2017-03-29 14:01:03 -07:00
Krasi Georgiev b87ee9b982 add nanoseconds to the filename for the checkoints create and restore filenames to avoid naming collision. 
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
 2017-03-23 21:29:49 +02:00
Kenfe-Mickaël Laventure 422e31ce90 Merge pull request #627 from mlaventure/fix-statedir 
Ensure state dir is created before starting server
 2017-03-15 07:55:30 -07:00
Kenfe-Mickael Laventure 49ca5b4d6e Ensure state dir is created before starting server 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-15 06:59:03 -07:00
Kenfe-Mickaël Laventure 7c92ec5298 Merge pull request #622 from hqhq/remove_log_level_def 
Remove default value of log-level
 2017-03-13 11:08:56 -07:00