GordonTheTurtle
ad2946faa1
Merge component 'cli' from git@github.com:docker/cli master
2018-01-23 16:41:06 +00:00
Sebastiaan van Stijn
2b99ce1d23
Merge pull request #816 from dnephin/binary-native
...
Add dockerfile for building on non-amd64 platforms
Upstream-commit: b6a628c295
Component: cli
2018-01-22 16:14:23 -08:00
Sebastiaan van Stijn
8c17001e4f
Merge pull request #826 from dnephin/fix-lint-errors
...
Fix lint on master
Upstream-commit: f2529443a0
Component: cli
2018-01-22 15:16:38 -08:00
Daniel Nephin
bc95dc9fb3
Fix merge conflict
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ae03b006a6
Component: cli
2018-01-22 18:09:47 -05:00
Vincent Demeester
e3d68b9fea
Merge pull request #780 from thaJeztah/fix-network-add
...
Fix --network-add adding duplicate networks
Upstream-commit: fbb9de2cfc
Component: cli
2018-01-22 14:45:58 -08:00
Sebastiaan van Stijn
d093175f6e
Merge pull request #696 from mlaventure/attach-use-containerwait
...
attach: Use ContainerWait instead of Inspect
Upstream-commit: 44a1168ae5
Component: cli
2018-01-20 23:55:16 +01:00
GordonTheTurtle
fa4fb352fe
Merge component 'engine' from git@github.com:moby/moby master
2018-01-20 17:03:57 +00:00
Akihiro Suda
dbd159de4c
Merge pull request #36065 from Microsoft/jjh/bumprs3andlcowsupported
...
Bump to RS3 final build, and remove LCOW_SUPPORTED
Upstream-commit: ef3f7d18da40cda7f33858b787161773d7656714
Component: engine
2018-01-20 19:53:30 +09:00
Anusha Ragunathan
bde2b4704d
Merge pull request #35830 from cpuguy83/unbindable_shm
...
Make container shm parent unbindable
Upstream-commit: c162e8eb417bbc124c1f89f676aea081ebb6251f
Component: engine
2018-01-19 17:43:30 -08:00
Vincent Demeester
946a37c1e4
Merge pull request #35744 from ndeloof/35702
...
closes #35702 introduce « exec_die » event
Upstream-commit: f97256cbf1811740cfa9a72f705c8a70195cd468
Component: engine
2018-01-19 15:03:50 -08:00
Brian Goff
2859d16079
Merge pull request #35986 from thaJeztah/bump-containerd-1.0.1-rc1
...
Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55)
Upstream-commit: 47a0dcbcd20aa2924c89a38a16a60907506ae4f2
Component: engine
2018-01-19 15:48:36 -05:00
Brian Goff
30c97f4539
Merge pull request #36003 from pradipd/upgrade_fix
...
Fixing ingress network when upgrading from 17.09 to 17.12.
Upstream-commit: 949ee0e5297408e97c9b5444d500a2cecab06609
Component: engine
2018-01-19 15:46:50 -05:00
John Howard
5e6be7b1c2
Bump RS3 final build, and remove LCOW_SUPPORTED
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5b24976ad4046a9c071b75df31d9269ad2e84732
Component: engine
2018-01-19 12:22:56 -08:00
Vincent Demeester
12ceea25e6
Merge pull request #36051 from Microsoft/jjh/remotefs-read-return-error
...
LCOW remotefs - return error in Read() implementation
Upstream-commit: 3c9d023af3428f49241a2e2385dae43151185466
Component: engine
2018-01-19 11:27:13 -08:00
Yong Tang
621663ea5d
Merge pull request #36061 from adampointer/36060-fix-name-clash
...
Alias container and network packages to stop name clashes
Upstream-commit: 507b8be5b3c02d2b99393d5613a6a59071e13786
Component: engine
2018-01-19 09:53:06 -08:00
GordonTheTurtle
3c3132fc24
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-01-19 17:04:04 +00:00
GordonTheTurtle
06609b9304
Merge component 'engine' from git@github.com:moby/moby master
2018-01-19 17:03:58 +00:00
GordonTheTurtle
c973e2ff26
Merge component 'cli' from git@github.com:docker/cli master
2018-01-19 16:41:06 +00:00
Brian Goff
d00d4e32b9
Merge pull request #34859 from Microsoft/jjh/singleimagestore
...
LCOW: Coalesce daemon stores, allow dual LCOW and WCOW mode
Upstream-commit: bb6ce897378b4ebd0131fd835b01ad5f9af3ebb9
Component: engine
2018-01-19 11:38:30 -05:00
Adam Pointer
ed76e0e519
Alias container and network packages to stop name clashes
...
Signed-off-by: Adam Pointer <adam.pointer@gmx.com >
Upstream-commit: 7732ca94fc67a28cbd37c292dc29216255685eba
Component: engine
2018-01-19 10:26:41 +00:00
John Howard
ebd586c561
LCOW remotefs - return error in Read() implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6112ad6e7d5d7f5afc698447da80f91bdbf62720
Component: engine
2018-01-18 17:46:58 -08:00
Brian Goff
46bc3ffbc5
Merge pull request #817 from vdemeester/make-manifest-cmd-experimental
...
Mark docker-manifest command as experimental (cli)
Upstream-commit: da86425e9f
Component: cli
2018-01-18 17:46:15 -05:00
Vincent Demeester
ac28efa249
Mark docker-manifest command as experimental (cli)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2d29732f40
Component: cli
2018-01-18 13:19:33 -08:00
Vincent Demeester
e94c45a5c9
Merge pull request #138 from clnperez/manifest-cmd
...
Add manifest command
Upstream-commit: 11dfa23a5d
Component: cli
2018-01-18 22:15:49 +01:00
John Howard
3ca8db9a46
Remove OS() from layer interface
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c94d34f783944ff6586846ccd11e86925fcee171
Component: engine
2018-01-18 12:56:28 -08:00
Eli Uriegas
676b242a5f
Merge pull request #71 from ZeuAlex/rpm_build_aarch64
...
Aarch64 rpm support
Upstream-commit: 4cc70e4be06cd19edfbcdab4619bc3c271a4a04c
Component: packaging
2018-01-18 12:55:53 -08:00
John Howard
40b95b8e94
Address feedback from Tonis
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0cba7740d41369eee33b671f26276325580bc07b
Component: engine
2018-01-18 12:30:39 -08:00
Vincent Demeester
9e8b44781f
Merge pull request #35965 from thaJeztah/fix-volume-create-statuscode
...
Return 400 status instead of 500 for empty volume create body
Upstream-commit: 39377bb96d459d2ef59bd2bad75468638a7f86a3
Component: engine
2018-01-18 20:02:33 +01:00
Sebastiaan van Stijn
b4c44961cf
Merge pull request #36030 from cpuguy83/quota_update
...
Ensure CPU quota/period updates are sent to runc
Upstream-commit: 0fa3962b8d8d78020c7e636c4bcea14d618929e1
Component: engine
2018-01-18 19:54:10 +01:00
Daniel Nephin
3fa889eb3f
Add dockerfile for building on non-amd64 platforms
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 02ca1c8573
Component: cli
2018-01-18 13:16:58 -05:00
GordonTheTurtle
86ca16658d
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-01-18 17:04:03 +00:00
GordonTheTurtle
3ee93da859
Merge component 'engine' from git@github.com:moby/moby master
2018-01-18 17:03:57 +00:00
Christy Perez
dc08aa82a2
add manifest cmd cli doc
...
Signed-off-by: Christy Norman Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 6c6ce22447
Component: cli
2018-01-18 10:53:09 -06:00
GordonTheTurtle
a654d0d2d6
Merge component 'cli' from git@github.com:docker/cli master
2018-01-18 16:41:08 +00:00
John Howard
852153685d
LCOW: Refactor to multiple layer-stores based on feedback
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: afd305c4b5682fbc297e1685e2b7a49628b7c7f0
Component: engine
2018-01-18 08:31:05 -08:00
John Howard
33860da10b
LCOW: Re-coalesce stores
...
Signed-off-by: John Howard <jhoward@microsoft.com >
The re-coalesces the daemon stores which were split as part of the
original LCOW implementation.
This is part of the work discussed in https://github.com/moby/moby/issues/34617 ,
in particular see the document linked to in that issue.
Upstream-commit: ce8e529e182bde057cdfafded62c210b7293b8ba
Component: engine
2018-01-18 08:29:19 -08:00
Brian Goff
ce1ad508f6
Merge pull request #35960 from abhi/service
...
Disable service on release network
Upstream-commit: 6feae060033544985e548dcf1b9127f8f634fe2b
Component: engine
2018-01-18 11:19:47 -05:00
Sebastiaan van Stijn
2096535fce
Fixes for libcontainer changes
...
Libcontainer no longer provides placeholders for
unsupported platforms, which cause the Windows
builds to fail.
This patch moves features that are not supported
to platform-specific files.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d1c34831e930c1f6b3de28cab3f4a358845a79d5
Component: engine
2018-01-18 10:08:12 +01:00
Sebastiaan van Stijn
8d6e00613b
Bump runc to 7f24b40cc5423969b4554ef04ba0b00e2b4ba010
...
matching the version that's used by containerd 1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f58aa31075bf74ab8d2369dafb591ae43ed36ee6
Component: engine
2018-01-18 10:07:50 +01:00
Sebastiaan van Stijn
c6678dac69
Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9047f66b1edd4dffcafc34f9c7f3390ddd65d10b
Component: engine
2018-01-18 10:06:37 +01:00
Eli Uriegas
2138e8ddb5
Merge pull request #73 from seemethere/remove_zesty
...
Remove Ubuntu Zesty
Upstream-commit: f8f8219caef8a92c6c87b92377d476af44d76b7c
Component: packaging
2018-01-17 15:12:34 -08:00
Sebastiaan van Stijn
3e6e651fda
Merge pull request #814 from dnephin/fix-builder-env-docs
...
Improve builder ENV docs
Upstream-commit: 4f550018bb
Component: cli
2018-01-17 23:26:42 +01:00
Abhinandan Prativadi
2b31b5d6e4
libnetwork vendor
...
Signed-off-by: abhi <abhi@docker.com >
Upstream-commit: dad093cc34497bb7912c769e469a3e79a0c2c63c
Component: engine
2018-01-17 14:20:04 -08:00
Abhinandan Prativadi
2012c45c5a
Disable service on release network
...
This PR contains a fix for moby/moby#30321 . There was a moby/moby#31142
PR intending to fix the issue by adding a delay between disabling the
service in the cluster and the shutdown of the tasks. However
disabling the service was not deleting the service info in the cluster.
Added a fix to delete service info from cluster and verified using siege
to ensure there is zero downtime on rolling update of a service.In order
to support it and ensure consitency of enabling and disable service knob
from the daemon, we need to ensure we disable service when we release
the network from the container. This helps in making the enable and
disable service less racy. The corresponding part of libnetwork fix is
part of docker/libnetwork#1824
Signed-off-by: abhi <abhi@docker.com >
Upstream-commit: a042e5a20a7801efc936daf7a639487bb37ca966
Component: engine
2018-01-17 14:19:51 -08:00
Daniel Nephin
33df5a9f66
Update buidler ENV docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 01b521c002
Component: cli
2018-01-17 16:55:07 -05:00
Yong Tang
d782361adb
Merge pull request #36043 from Microsoft/jjh/fixopenfilecall
...
LCOW: Fix OpenFile parameters
Upstream-commit: ef3988a81f5dca972b129df527f3e4f8bba200b8
Component: engine
2018-01-17 12:03:11 -08:00
unclejack
28df99f4fa
Merge pull request #35697 from sargun/use-pgzip
...
Make image (layer) downloads faster by using pigz
Upstream-commit: 871afbb304422877e683cbafc0ebd0b029b85379
Component: engine
2018-01-17 11:18:20 -08:00
Pradip Dhara
0986b8a32c
Fixing ingress network when upgrading from 17.09 to 17.12.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 2d7a50e5855ad0571e76d29cd1ab9f8f3a48433b
Component: engine
2018-01-17 17:11:18 +00:00
GordonTheTurtle
b602be47f6
Merge component 'engine' from git@github.com:moby/moby master
2018-01-17 17:04:48 +00:00
GordonTheTurtle
1c449fb090
Merge component 'cli' from git@github.com:docker/cli master
2018-01-17 16:41:12 +00:00