cbcb1aca45
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-25 05:58:35 +00:00
680164099a
pass in git commit override when building deb
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3c70b56937c415c6bf3516aeaa5231c6d7d3145d
Component: packaging
2017-05-25 05:57:29 +00:00
a88dc6ffda
override ver and git commit when building all deb pkgs
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 4397990e00863254d78c44fbe904a70272b5b340
Component: packaging
2017-05-25 05:22:42 +00:00
cefc7ca79a
Merge component 'cli' from git@github.com:docker/cli master
2017-05-24 23:00:04 +00:00
9cdca5ef2e
pass in optional GITCOMMIT override
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 446af3a9b7
2017-05-24 22:45:42 +00:00
92d664086d
Make the hash_files target non interactive
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 097516fc76a2c9acf798dc523326904520ff1fc7
Component: packaging
2017-05-24 10:11:40 -07:00
d1013c3e75
Merge pull request #102 from keloyang/attach-block
...
Recheck the container's state to avoid attach block.
Upstream-commit: 61c0b9f78d
2017-05-24 12:09:38 +01:00
79087a0823
Merge pull request #109 from vdemeester/codecov-in-circle
...
Add test-coverage & codecov target and update circleci
Upstream-commit: e47cc91ac9
2017-05-23 11:59:05 -04:00
d097d03226
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-23 03:30:17 +00:00
b602250a48
more doc cleanup
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: dafbbb4fa4fbaade4ae0a6abcba39bbfcd8f755d
Component: packaging
2017-05-23 03:19:52 +00:00
fe481b52a5
Move the hashing of files to its own target
...
So we can use it at will
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 533a843393bd7c3674074ec9af73c8e666fc7484
Component: packaging
2017-05-22 15:11:53 -07:00
b3cf695357
Add file hashing for static files
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: a1b7f6f3407546ff41ed2e0d16d7e1b2a8ac0ef4
Component: packaging
2017-05-22 14:43:24 -07:00
1d9c61db3a
allow version number to be set in builds
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3dfe334a7a
2017-05-22 13:22:42 -07:00
b936f95f25
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-22 19:51:06 +00:00
141bcdee33
specific version numbers for ubuntu
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: c4e3bb1768ff6f6285e65ca88436aa7de5b89bc8
Component: packaging
2017-05-22 19:48:10 +00:00
3faf0eaaca
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-20 06:07:04 +00:00
a36b59a609
fix static package generation
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3513248c56fc917a0b37ff140ca7981d7af933ef
Component: packaging
2017-05-20 06:00:56 +00:00
b3f06aaffe
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-20 05:12:23 +00:00
61ed131a71
initial commit
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: f64fc552cdfc4b4f2efb384054970fb0bfc1bd25
Component: packaging
2017-05-20 05:11:06 +00:00
969598bdd6
Initial commit
...
Upstream-commit: 3b31275fd8206e35f73e37d91ccaea19446eb79c
Component: packaging
2017-05-19 20:08:25 -07:00
1959f587f4
Recheck the container's state to avoid attach block.
...
If use docker attach command to attach to a stop container, it will return
"You cannot attach to a stopped container" error, it's ok, but when
attach to a running container, it(docker attach) use inspect to check
the container's state, if it pass the state check on the client side,
and then the container is stopped, docker attach command still attach to
the container and not exit.
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
Upstream-commit: f9dc3337f9
2017-05-20 08:02:06 +08:00
3335862e61
Merge component 'engine' from git@github.com:moby/moby master
2017-05-19 23:48:32 +00:00
f039c950a8
Upload coverage report from outside of test container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f6d148c632
2017-05-19 17:37:38 -04:00
56d05cc358
Add test-coverage & codecov target and update circleci
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d79d903864
2017-05-19 17:22:37 -04:00
5bbf4871d4
Merge pull request #106 from dnephin/improve-makefile
...
Remove @ from Makefiles
Upstream-commit: 883d28cfce
2017-05-19 16:03:04 -04:00
ddd4203548
Merge pull request #33261 from aaronlehmann/empty-platform
...
api: Only return a Platform when relevant information is available
Upstream-commit: f888a25ff5bc9bb7c95400ec19b9a5fa0d738bab
Component: engine
2017-05-19 20:05:07 +02:00
756d246384
Merge pull request #33299 from thaJeztah/explain-relation-between-paused-and-stopped
...
Improve description of Running and Paused booleans
Upstream-commit: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff
Component: engine
2017-05-19 16:29:05 +02:00
1dc2936c51
Merge pull request #33293 from fd/patch-1
...
Remove deadlock in ContainerWait
Upstream-commit: d98d4faef86c4ba4470c7f28c2ce92c10de4a565
Component: engine
2017-05-19 16:17:54 +02:00
b0a3ababea
Merge pull request #33286 from aboch/ingr
...
Properly identify ingress network created with older swarm
Upstream-commit: 39a604c0d419424bab0314e7070c49bcacca3bda
Component: engine
2017-05-19 10:04:29 -04:00
845a39e447
Merge pull request #33296 from vdemeester/more-opts-cleanup
...
Remove more opts unused in docker/docker
Upstream-commit: d8e85f8c60929e0bc1313983f5007ad92f8adf29
Component: engine
2017-05-19 10:01:34 -04:00
4bffda81c9
Improve description of Running and Paused booleans
...
Commit abd72d4008dde7ee8249170d49eb4bc963c51e24 added
a "FIXME" comment to the container "State", mentioning
that a container cannot be both "Running" and "Paused".
This comment was incorrect, because containers on
Linux actually _must_ be running in order to be
paused.
This patch adds additional information both in a
comment, and in the API documentation to clarify
that these booleans are not mutually exclusive.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b654b6244d6d63a0758029488a95feb446e089bd
Component: engine
2017-05-19 12:29:54 +02:00
64383889f3
Remove more opts unused in docker/docker
...
These are already present in `docker/cli` 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61e527f16ccbbbca137c4db1b13b558ee4a51213
Component: engine
2017-05-19 12:05:51 +02:00
87298d4be7
Remove deadlock in ContainerWait
...
when `cli.post(...)` fails `errC <- err` blocks because `errC` is unbufferd.
Signed-off-by: Simon Menke <simon.menke@gmail.com >
Upstream-commit: 4d2d2ea39336aade783c5c415b83d129bdd339bb
Component: engine
2017-05-19 09:23:52 +02:00
1e0f9dbab8
arg filt
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: 49bf533fe72fd2390da89d133fbe984d0284ebe2
Component: engine
2017-05-19 13:47:32 +08:00
fc392f988e
Merge pull request #33280 from mavenugo/vin-ln-1706
...
Vendoring libnetwork b2bc1a684
Upstream-commit: ab83b924bc5dde5c2ac81b0befe5e370f3acb7e3
Component: engine
2017-05-18 23:31:23 -04:00
ba221c0328
Properly identify ingress network created with older swarm
...
- otherwise docker network prune will remove it
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 93763f11eeec5e9b1d0308a3ad85bbf069f9107f
Component: engine
2017-05-18 19:47:45 -07:00
01eae47819
Merge pull request #33281 from dmcgowan/overlay2-on-btrfs
...
Support overlay2 on btrfs
Upstream-commit: 01af41ed99f96693bd04bec1cf0f7a6b97bc2408
Component: engine
2017-05-19 03:09:39 +02:00
200114130e
Merge pull request #33278 from tonistiigi/plugin-chroot
...
Use chrootarchive for plugin rootfs
Upstream-commit: 6c05ceeb0b483f15b4b7b449db6c3f32a5e30d6b
Component: engine
2017-05-19 02:38:29 +02:00
a41009bb07
Merge pull request #33269 from tophj-ibm/switch-more-syscalls-pkg-term
...
[pkg/term] switch more syscalls to /x/sys/
Upstream-commit: dd27bbb41a7f98a0beea3d7f39da0dbb53e29ff5
Component: engine
2017-05-19 02:37:52 +02:00
10c5371927
Support overlay2 on btrfs
...
OverlayFS is supported on top of btrfs as of Linux Kernel 4.7.
Skip the hard enforcement when on kernel 4.7 or newer and
respect the kernel check override flag on older kernels.
https://btrfs.wiki.kernel.org/index.php/Changelog#By_feature
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: f64a4ad008e68996afcec3ab34a869887716f944
Component: engine
2017-05-18 15:26:03 -07:00
f6ecbd87c6
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
2017-05-18 15:14:12 -07:00
2d8e76dfbc
Merge pull request #33274 from aaronlehmann/update-cli
...
Update CLI commit hash
Upstream-commit: da9a8854834cb48a8112d8192811d9c41f8be358
Component: engine
2017-05-18 15:11:10 -07:00
14bb0faf0c
Use chrootarchive for plugin rootfs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6f3f907cdba0ba1aa4eb1320595d155bab3467af
Component: engine
2017-05-18 14:53:46 -07:00
0d783a82c9
Merge pull request #33267 from YuPengZTE/devImageWithDigestString
...
ineffectual assignment to isCanonical, delete it, and make the "if" sentence to fit the golang usage
Upstream-commit: b0dd3dfc1184b210854b62c231b7b074dd6dbd26
Component: engine
2017-05-18 23:37:52 +02:00
6b7f9e397d
Merge pull request #33250 from cyphar/apparmor-readonly-root-fix
...
apparmor: make pkg/aaparser work on read-only root
Upstream-commit: 6b262572028cc249b7da8cc55459197395fdb33e
Component: engine
2017-05-18 23:17:31 +02:00
b7e3ae2808
Merge pull request #33264 from wenjianhn/chkp-ls
...
Fix checkpoint ls
Upstream-commit: cc24049f77eb94ad486bd22c2470f0d13d6158a1
Component: engine
2017-05-18 13:37:42 -07:00
d490134960
Update CLI commit hash
...
Since this new version of the CLI resolves image digests for swarm
services by default, and we do not want integration tests to talk to
Docker Hub, update CLI tests to suppress this behavior.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: d012569b78c27e6e52bc5006d9a1d7a2099b1c2b
Component: engine
2017-05-18 12:23:28 -07:00
4d54b44919
Enabled linux/ppc64le cross build.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 46049dd0b6
2017-05-18 13:07:26 -04:00
17712f857a
Improved poor memory efficiency of awslogs
...
Signed-off-by: YAMASAKI Masahide <masahide.y@gmail.com >
Upstream-commit: 524f30634018ce619da61aa0a13dad245e098226
Component: engine
2017-05-18 23:30:00 +09:00
f074fcfdd0
[pkg/term] switch more syscalls to /x/sys/
...
Switches the remaining syscalls except Errno to /x/sys/.
This was supposed to be part of 33180
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: df6dfcf198a769e7f411736e1abb93e1aabb2698
Component: engine
2017-05-18 09:02:42 -04:00
