p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
29,983 Commits 2 Branches 295 Tags
c7bd985ccb68efe2ef6ed625303dbdf9e4e31389
Commit Graph

194 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
433a6ae35a Merge pull request #29314 from vdemeester/no-more-utils 
Remove the utils package
Upstream-commit: b9ee31ae027bbd62477fea3f58023c90f051db00
Component: engine
 2016-12-22 15:21:05 +01:00
lixiaobing10051267
c493517769 fix some typos in libcontainer\types_windows.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f385846d6ff48c17b7fc8173b8370df17c76ad40
Component: engine
 2016-12-14 16:33:03 +08:00
Vincent Demeester
90c004590f Move process functions to pkg/system 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8c1ac816657a1371597c4b2d1a758bee0114e0d7
Component: engine
 2016-12-12 09:28:41 +01:00
Lei Jitang
dc6f3f84fc Fix docker restart panic on machine ungracefully shutdown 
Machine ungracefully shutdown leaves a lot of container has a
Running=true state.

```
$ cat config.v2.json | jq .

    "Running": true,
    "Paused": false,
    "Restarting": false,

```

And the next docker start will fail with panic.

```

time="2016-12-01T01:54:45.086446715-05:00" level=warning msg="libcontainerd: client is out of sync, restore was called on a fully synced container (49f41ad5ca0be860622d9190673b5816d012022fb2c1794560ec4851e7cfec6a)."
time="2016-12-01T01:54:45.087046004-05:00" level=warning msg="libcontainerd: failed to retrieve container 49f41ad5ca0be860622d9190673b5816d012022fb2c1794560ec4851e7cfec6a state: rpc error: code = 2 desc = containerd: container not found"
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x8 pc=0x5db7f3]

goroutine 57 [running]:
panic(0x16a8e60, 0xc420010130)
        /usr/local/go/src/runtime/panic.go:500 +0x1a1
github.com/docker/docker/libcontainerd.(*client).Restore(0xc4202e1a40, 0xc420415000, 0x40, 0xc42015a0b0, 0x0, 0x0, 0x0, 0x0, 0x0)
        /go/src/github.com/docker/docker/libcontainerd/client_linux.go:457 +0x553
github.com/docker/docker/daemon.(*Daemon).restore.func1(0xc4201c46f0, 0xc4202581e0, 0xc4201c46e8, 0xc42047bfb0, 0xc42047bf80, 0xc42047bf50, 0xc42024ba10, 0xc420512c00)
        /go/src/github.com/docker/docker/daemon/daemon.go:205 +0x198
created by github.com/docker/docker/daemon.(*Daemon).restore
        /go/src/github.com/docker/docker/daemon/daemon.go:260 +0x7bb

```

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 267422e4d08244e701ce049ab55ca0ad9879ba78
Component: engine
 2016-12-01 02:25:24 -05:00
Kenfe-Mickael Laventure
eb1bfafb6a Fix race with containerd events stream on restore 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 9fff9bb761b3ceb1ef09ab2d6dbdbaa4463a063c
Component: engine
 2016-11-30 10:15:39 -08:00
Lei Jitang
c081d78f0c Ignore "failed to close stdin" if container or process not found 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9aedaf5b3acc0dd0df4a4b67c46cf922d42f62a3
Component: engine
 2016-11-29 20:41:39 -05:00
Tonis Tiigi
c0d4c1f04f Fix race on sending stdin close event 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4e262f63876018ca78d54a98eee3f533352b0ac9
Component: engine
 2016-11-21 17:43:01 -08:00
Darren Stahl
bee0ae1311 Shutdown instead of terminate process on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8b503242734d66a223bf8d694f26901b1d02106d
Component: engine
 2016-11-18 12:05:08 -08:00
Akshay Karle
0a4f3b6f0e fix a typo 
Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com>
Upstream-commit: 2d08a764211035ec93aa3a97afb2baff074103da
Component: engine
 2016-11-17 16:51:37 -05:00
Victor Vieux
4d7a48f6ec Merge pull request #27955 from mlaventure/runc-docker-info 
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
 2016-11-10 21:27:14 -08:00
Darren Stahl
828e14b6f7 Adding more strict resource checks on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0ed00b36ff7d8651e4d11a41507f81441c081388
Component: engine
 2016-11-09 16:29:54 -08:00
Victor Vieux
dc6854b4b3 Merge pull request #28184 from Microsoft/jjh/user 
Windows: Plumb through user
Upstream-commit: f67d4b897adc9048269d1b91435b6dcbf69e36d1
Component: engine
 2016-11-09 11:32:42 -08:00
Kenfe-Mickael Laventure
515ebb7b5c Add expected 3rd party binaries commit ids to info 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 2790ac68b32b399c872de88388bdccc359ed7a88
Component: engine
 2016-11-09 07:42:44 -08:00
Darren Stahl
7242352354 Stop returning errors that should be ignored while closing stdin 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ae35c0f70e96de011ad376c8fffba8e8a52ec21f
Component: engine
 2016-11-08 18:25:43 -08:00
John Howard
234aecaaa6 Windows: Plumb through user 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5207ff7202327bd06fa7e8df4c58d6a944899b60
Component: engine
 2016-11-08 17:41:56 -08:00
Tonis Tiigi
28d4c9907d Don’t warn on missing fifo 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee9d28bd3fa3fb98a231a76bf4908397d63fec1d
Component: engine
 2016-11-08 09:59:49 -08:00
Amit Krishnan
6fb90ed484 Add functional support for Docker sub commands on Solaris 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 934328d8ea650bf8a9c3c719999ce2a1f5dd5df6
Component: engine
 2016-11-07 09:06:34 -08:00
Darren Stahl
c8300bf35f Windows: Add cpu count option 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 4e15420b9be50ddd7fa65e5c7f9b732777f9cc35
Component: engine
 2016-11-04 13:38:50 -07:00
Yanqiang Miao
62d913cd94 Clean up the constants in 'libcontainerd' that are no longer in use 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 1ad989559f73be34d180122609882273c1ad9f6a
Component: engine
 2016-10-28 13:39:04 +08:00
Tonis Tiigi
b4087aee32 Fix logging formatting 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: aa01ee4ac5b8bd2be25db06938533347223f30ba
Component: engine
 2016-10-25 18:34:35 -07:00
Tonis Tiigi
1883869e16 Move stdio attach from libcontainerd backend to callback 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 37a3be2449d2a314305615ffcc287a598a829dba
Component: engine
 2016-10-24 00:20:36 -07:00
Tonis Tiigi
6b04858e42 Refactor stdin closing 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6f2658fb8cbaf5972c4c069817ed16e80d461514
Component: engine
 2016-10-20 17:10:15 -07:00
Tonis Tiigi
5c4198ba60 Fix issues with fifos blocking on open 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6d26464502b4e8ecfd8f5605196605624fb79944
Component: engine
 2016-10-20 17:02:02 -07:00
Antonio Murdaca
dd35c23542 record pid of exec'd process 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
 2016-10-20 17:06:11 +02:00
Jonh Wendell
bf1e1cd730 Exec: Add ability to set environment variables 
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
Upstream-commit: e03bf1221ee2c863f25a57af4d415e2d8ff4f26c
Component: engine
 2016-10-19 12:39:25 -02:00
Sebastiaan van Stijn
6e21c70cae Merge pull request #26795 from darrenstahlmsft/PauseResume 
Implement Pause Resume support for Windows
Upstream-commit: dd383898cdcbcef7bd48bc0115cc9a739cf610f3
Component: engine
 2016-10-13 18:08:11 -07:00
John Howard
955590ce96 Merge pull request #27310 from swernli/servicing-error-reporting 
Fixing error reporting on servicing failure
Upstream-commit: e736b9a1725bcac02589a7bf61f21c2a0490203d
Component: engine
 2016-10-12 08:47:54 -07:00
Stefan J. Wernli
77b18735c8 Fixing error reporting on servicing failure 
The code that handles waiting for the servicing container to complete correctly grabs the exit code and logs a failure, but doesn't return that failure to the caller, mistakenly causing servicing operations to look successful when they really failed during processing.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: f65647463eb8e6ba0675d295aed492d3617306a2
Component: engine
 2016-10-11 17:11:56 -07:00
Darren Stahl
83dc9e6cea Implement Pause Resume support for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 69985e85d37af827fe2940a35d13e8b20a08fc8c
Component: engine
 2016-10-11 16:23:35 -07:00
Justin Cormack
23ee37555b Merge pull request #26690 from mwhudson/ignore-oom_score_adj-failure 
Ignore failure to set oom_score_adj, as happens in an unprivileged container.
Upstream-commit: d316e172da464bd7fb88e45069cb459f90f710bd
Component: engine
 2016-10-11 10:01:22 +01:00
Tonis Tiigi
97516856c4 Remove restartmanager from libcontainerd 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 606a245d8548e98e889df1b9cf511b5953a309b9
Component: engine
 2016-10-07 12:09:54 -07:00
Vincent Demeester
d1b375bf46 Merge pull request #23389 from Microsoft/jjh/credentialspec 
Windows: Support credential specs
Upstream-commit: b3cc3d7bf9606b64833d5596fee84bff416652c3
Component: engine
 2016-10-07 18:32:44 +02:00
John Howard
75a301f015 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e85867cb68cc28208c91bb43fc5cdcff824c468e
Component: engine
 2016-10-06 09:32:22 -07:00
Darren Stahl
02536572fb Revendor hcsshim to v0.5.1 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 267c04aa36a54260242a2cffbd19d4f25f782e94
Component: engine
 2016-10-05 14:40:51 -07:00
Alexander Morozov
7b053bbb81 Merge pull request #27149 from swernli/servicing_fix 
Fixing servicing bug by always specifying LayerFolderPath
Upstream-commit: 33ae7d4c195d9096def013fcd4af32df3c2f4606
Component: engine
 2016-10-05 13:21:47 -07:00
Michael Crosby
c735d7ed2f Merge pull request #27038 from jstarks/non_base_utilityvm 
Windows: support Windows servicing layers
Upstream-commit: 214b70e6ef9c5430c48cd88303f4cc0574e0037a
Component: engine
 2016-10-05 10:02:31 -07:00
Brian Goff
546bf84a57 Merge pull request #27152 from darrenstahlmsft/Rounding 
Windows: fix rounding error in container resources
Upstream-commit: c48317ad7ca4eebe7f84cab6075707493eb7c567
Component: engine
 2016-10-04 21:08:14 -04:00
Stefan J. Wernli
4ab9943ca0 Fixing servicing bug by always specifying LayerFolderPath 
During the recent OCI changes, I mistakenly thought LayerFolderPath is only needed for Windows Server containers (isolation=process) and not for Hyper-V Containers, but it turns out it is also required for servicing containers used to finish installing updates.  Since the servicing containers need to reuse the container's create options, this change makes it so that LayerFolderPath is always filled in for all containers as part of constructing the create options.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 78540d0d181d581342b0a2750786ae91e6ed9f91
Component: engine
 2016-10-04 15:29:30 -07:00
Darren Stahl
2c7a91b704 Windows: fix rounding error in container resources 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 1b48203f179e2e469d0fb1963dba0b2376f53eb0
Component: engine
 2016-10-04 14:11:32 -07:00
allencloud
43c9d470cf add lock in libcontainerd client AddProcess of Windows 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5143be0ccf70c7cb2acc2aa39fd7ec47450e5daa
Component: engine
 2016-10-04 10:29:21 +08:00
allencloud
455b5fdd43 add lock in libcontainerd client AddProcess 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 278273bc1699873304240a6eca342b54051e2f23
Component: engine
 2016-10-02 00:36:25 +08:00
John Starks
64cc662c76 Windows: Use the top-most utility VM image 
Microsoft will be distributing non-base layers that have utility VM image
updates. Update libcontainerd to use the top-most utility VM image that is
available in the image chain when launching Hyper-V-isolated container.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 2a765279fac29a3f4040f3a41a38d6bbacc2d35e
Component: engine
 2016-09-29 10:49:02 -07:00
John Howard
434bea436a Remove hacked Windows OCI spec, compile fixups 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 02309170a5fb97d40260d0ee9e24b44be8c780b2
Component: engine
 2016-09-27 12:07:35 -07:00
Victor Vieux
a3e576de79 Merge pull request #26744 from LK4D4/attach_before_start 
libcontainerd: attach streams before create
Upstream-commit: f67096c20b0bcbee115c9923861bfc25bbe3b4f2
Component: engine
 2016-09-26 13:08:05 -07:00
msabansal
6bf922c44e Changes required to support windows service discovery 
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: d1e0a78614d4efa768c88c9db3868bc9e7782efc
Component: engine
 2016-09-22 12:21:21 -07:00
John Howard
c0c81b997f Merge pull request #26677 from Microsoft/jjh/networkendpointlist 
Windows OCI: Remove endpoint list
Upstream-commit: dc8631ea53ddebf8e1c09ef95c21a9d739a6a385
Component: engine
 2016-09-22 11:36:25 -07:00
Sebastiaan van Stijn
809e58fdc4 Merge pull request #26796 from Microsoft/jjh/race-lcd-si 
Windows: Data race in libcontainerd (si)
Upstream-commit: 221d4fca0cc2b2b87556b459fea8342aeb271a81
Component: engine
 2016-09-22 19:44:17 +02:00
John Howard
debe74e333 Windows OCI: Remove endpoint list 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 410a8612f481e67265ce0edaf78ed1d96f6dffcf
Component: engine
 2016-09-22 10:08:13 -07:00
Michael Crosby
7195c6a9d6 Merge pull request #26746 from Microsoft/jjh/hvruntime 
Windows: OCI HVRuntime and LayerPaths to options
Upstream-commit: 3990f2816250cba4d48a867eccdc86712d0990b2
Component: engine
 2016-09-22 09:55:58 -07:00
John Howard
05ab8e37e3 Windows: Data race in libcontainerd (si) 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2499dff6433105024c9434c652731087f32892c
Component: engine
 2016-09-21 14:36:51 -07:00