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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
02d52c35b1
libcontainerd: attach streams before create
...
Fix #26371
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 02d1934279294f28af6e509a29f909654677ed8b
Component: engine
2016-09-21 09:16:12 -07:00
a6e85b050d
add log messages when write to oom_score_adj fails
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@canonical.com >
Upstream-commit: 9ed54d3c674ea25d7e038a7506f68924aa8d39d6
Component: engine
2016-09-21 19:36:36 +12:00
1c50565e28
Revert the fix to invalid handles due to a platform bug
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: f6d5f7b9752080981cb17052e8ab529be129e3ef
Component: engine
2016-09-20 17:31:24 -07:00
fe82ab0481
Merge pull request #26538 from LK4D4/update_grpc
...
Update grpc to v1.0.1-GA
Upstream-commit: 758a809f5453355c6d118271db971d90248652f5
Component: engine
2016-09-20 23:19:26 +02:00
f621a80cd1
Windows: OCI HVRuntime and LayerPaths to options
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3aceeac50f35e2b10323087b2a1f21af45ee143
Component: engine
2016-09-20 13:51:53 -07:00
4145d55809
Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing
...
Windows: OCI aggressive namespacing
Upstream-commit: 511fd4940282f4ed6df39f3c2ebc8b9a0f060c82
Component: engine
2016-09-20 13:37:41 -07:00
96b868c729
Merge pull request #25849 from darrenstahlmsft/LibcontainerdRaces
...
Lock all calls to hcsshim to prevent close races
Upstream-commit: 434887824241806f6bc0a686966245c569778c00
Component: engine
2016-09-20 10:34:54 -07:00
caffc36efd
libcontainerd: do not use failfast for events stream
...
New grpc uses failfast by default, but that code was written with other
default in mind, so just preserve it for now.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5fb383243234dfebc468207cfd7f64eca1b7f849
Component: engine
2016-09-20 09:24:40 -07:00
7330d7eef7
Oops, break should have been continue
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bbbc720620befd1ba6f1ff9b0ac69a590bdac68e
Component: engine
2016-09-19 14:41:27 -07:00
62c8ac5cdc
Merge pull request #26579 from Microsoft/jjh/ociprocess
...
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
2016-09-19 22:52:16 +02:00
be47d46c3b
Lock all calls to hcsshim to prevent close races
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 740e26f384fe4fe70b5dd2ec5ef80cfdbafac177
Component: engine
2016-09-19 12:59:02 -07:00
abf6940f56
Merge pull request #26640 from Microsoft/jjh/removeosversion
...
Windows: Remove osversion from OCI
Upstream-commit: b7e189ed1fd474d7cbdacc3b6b76e97fc2abf017
Component: engine
2016-09-19 15:42:34 -04:00
92d37247b3
Windows: OCI process struct convergence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
2016-09-19 10:34:31 -07:00
454fb85f2d
Windows: OCI aggressive namespacing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c89db6c044963c626a5240ef27078b2c4616d1ae
Component: engine
2016-09-19 10:23:11 -07:00
13bd68497d
Merge pull request #26505 from Microsoft/jjh/ocistep1
...
Windows OCI convergence step 1
Upstream-commit: 3fd3d28f5f82fc44d5e563c8f90dd00f037b9653
Component: engine
2016-09-19 10:23:11 -07:00
8abf4dbc45
Windows: Remove osversion from OCI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 72de562943a9bfbc44d24c80dfc9d0dc112ab0f4
Component: engine
2016-09-19 10:16:15 -07:00
aa8b9ee0c3
Merge pull request #26577 from Microsoft/jjh/fstabmount
...
Windows: Move to fstab options as per OCI
Upstream-commit: b72c7f74a616a52a52843cf5b295962845be3ba3
Component: engine
2016-09-19 10:13:46 -07:00
5a03e9169d
Fix a race in libcontainerd/pausemonitor_linux.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 69f00a137c886bd0e06b9fd2bb438f4eab1ade50
Component: engine
2016-09-19 07:42:21 +00:00
601f07305c
Ignore failure to set oom_score_adj, as happens in an unprivileged container.
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@canonical.com >
Upstream-commit: 32f24bc3c59af530196d3613dcb55ffced964de4
Component: engine
2016-09-19 14:27:10 +12:00
