beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29774 commits 14 branches 412 tags 338 MiB
Commit graph

192 commits

Author SHA1 Message Date
John Howard
0017cf150a Windows: Cleanup HCS on restore 
Signed-off-by: John Howard <jhoward@microsoft.com>

This ensures that any compute processes in HCS are cleanedup
during daemon restore. Note Windows cannot (currently) reconnect
to containers on restore.

(cherry picked from commit f59593cbd1)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-13 21:21:18 -07:00
Kenfe-Mickael Laventure
25810f3f47 Remove timeout on fifos opening 
Instead of a timeout the context is cancelled on error to ensure
proper cleanup of the associated fifos' goroutines.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit c178700a04)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-24 15:57:14 -08:00
Lei Jitang
32e0ea346b 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>
(cherry picked from commit 267422e4d0)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-12-01 13:40:44 -08:00
Lei Jitang
79f153f49e Ignore "failed to close stdin" if container or process not found 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 9aedaf5b3a)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-30 14:09:19 -08:00
Kenfe-Mickael Laventure
5e5d02b9f5 Fix race with containerd events stream on restore 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 9fff9bb761)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-30 14:06:59 -08:00
Tonis Tiigi
3f0aa9bceb Fix race on sending stdin close event 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 4e262f6387)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-22 11:25:33 -08:00
Akshay Karle
78fe91c31c fix a typo 
Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com>
 2016-11-18 13:28:11 -08:00
Victor Vieux
0427afa409 Merge pull request #27955 from mlaventure/runc-docker-info 
Add external binaries version to docker info
 2016-11-10 21:27:14 -08:00
Darren Stahl
0ed00b36ff Adding more strict resource checks on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-09 16:29:54 -08:00
Victor Vieux
f67d4b897a Merge pull request #28184 from Microsoft/jjh/user 
Windows: Plumb through user
 2016-11-09 11:32:42 -08:00
Kenfe-Mickael Laventure
2790ac68b3 Add expected 3rd party binaries commit ids to info 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-11-09 07:42:44 -08:00
Darren Stahl
ae35c0f70e Stop returning errors that should be ignored while closing stdin 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-08 18:25:43 -08:00
John Howard
5207ff7202 Windows: Plumb through user 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-08 17:41:56 -08:00
Tonis Tiigi
ee9d28bd3f Don’t warn on missing fifo 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-08 09:59:49 -08:00
Amit Krishnan
934328d8ea 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>
 2016-11-07 09:06:34 -08:00
Darren Stahl
4e15420b9b Windows: Add cpu count option 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-04 13:38:50 -07:00
Yanqiang Miao
1ad989559f 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>
 2016-10-28 13:39:04 +08:00
Tonis Tiigi
aa01ee4ac5 Fix logging formatting 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-25 18:34:35 -07:00
Tonis Tiigi
37a3be2449 Move stdio attach from libcontainerd backend to callback 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-24 00:20:36 -07:00
Tonis Tiigi
6f2658fb8c Refactor stdin closing 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-20 17:10:15 -07:00
Tonis Tiigi
6d26464502 Fix issues with fifos blocking on open 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-20 17:02:02 -07:00
Antonio Murdaca
1808348136
record pid of exec'd process 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-20 17:06:11 +02:00
Jonh Wendell
e03bf1221e 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>
 2016-10-19 12:39:25 -02:00
Sebastiaan van Stijn
dd383898cd Merge pull request #26795 from darrenstahlmsft/PauseResume 
Implement Pause Resume support for Windows
 2016-10-13 18:08:11 -07:00
John Howard
e736b9a172 Merge pull request #27310 from swernli/servicing-error-reporting 
Fixing error reporting on servicing failure
 2016-10-12 08:47:54 -07:00
Stefan J. Wernli
f65647463e 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>
 2016-10-11 17:11:56 -07:00
Darren Stahl
69985e85d3 Implement Pause Resume support for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-11 16:23:35 -07:00
Justin Cormack
d316e172da Merge pull request #26690 from mwhudson/ignore-oom_score_adj-failure 
Ignore failure to set oom_score_adj, as happens in an unprivileged container.
 2016-10-11 10:01:22 +01:00
Tonis Tiigi
606a245d85 Remove restartmanager from libcontainerd 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-07 12:09:54 -07:00
Vincent Demeester
b3cc3d7bf9 Merge pull request #23389 from Microsoft/jjh/credentialspec 
Windows: Support credential specs
 2016-10-07 18:32:44 +02:00
John Howard
e85867cb68 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-06 09:32:22 -07:00
Darren Stahl
267c04aa36 Revendor hcsshim to v0.5.1 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-05 14:40:51 -07:00
Alexander Morozov
33ae7d4c19 Merge pull request #27149 from swernli/servicing_fix 
Fixing servicing bug by always specifying LayerFolderPath
 2016-10-05 13:21:47 -07:00
Michael Crosby
214b70e6ef Merge pull request #27038 from jstarks/non_base_utilityvm 
Windows: support Windows servicing layers
 2016-10-05 10:02:31 -07:00
Brian Goff
c48317ad7c Merge pull request #27152 from darrenstahlmsft/Rounding 
Windows: fix rounding error in container resources
 2016-10-04 21:08:14 -04:00
Stefan J. Wernli
78540d0d18 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>
 2016-10-04 15:29:30 -07:00
Darren Stahl
1b48203f17 Windows: fix rounding error in container resources 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-04 14:11:32 -07:00
allencloud
5143be0ccf add lock in libcontainerd client AddProcess of Windows 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-04 10:29:21 +08:00
allencloud
278273bc16 add lock in libcontainerd client AddProcess 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-02 00:36:25 +08:00
John Starks
2a765279fa 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>
 2016-09-29 10:49:02 -07:00
John Howard
02309170a5 Remove hacked Windows OCI spec, compile fixups 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-27 12:07:35 -07:00
Victor Vieux
f67096c20b Merge pull request #26744 from LK4D4/attach_before_start 
libcontainerd: attach streams before create
 2016-09-26 13:08:05 -07:00
msabansal
d1e0a78614 Changes required to support windows service discovery 
Signed-off-by: msabansal <sabansal@microsoft.com>
 2016-09-22 12:21:21 -07:00
John Howard
dc8631ea53 Merge pull request #26677 from Microsoft/jjh/networkendpointlist 
Windows OCI: Remove endpoint list
 2016-09-22 11:36:25 -07:00
Sebastiaan van Stijn
221d4fca0c Merge pull request #26796 from Microsoft/jjh/race-lcd-si 
Windows: Data race in libcontainerd (si)
 2016-09-22 19:44:17 +02:00
John Howard
410a8612f4 Windows OCI: Remove endpoint list 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-22 10:08:13 -07:00
Michael Crosby
3990f28162 Merge pull request #26746 from Microsoft/jjh/hvruntime 
Windows: OCI HVRuntime and LayerPaths to options
 2016-09-22 09:55:58 -07:00
John Howard
c2499dff64 Windows: Data race in libcontainerd (si) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-21 14:36:51 -07:00
Alexander Morozov
02d1934279 libcontainerd: attach streams before create 
Fix #26371

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-21 09:16:12 -07:00
Michael Hudson-Doyle
9ed54d3c67 add log messages when write to oom_score_adj fails 
Signed-off-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
 2016-09-21 19:36:36 +12:00