Jessica Frazelle
5944bec2a8
ignore certain tests on lxc driver
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0a5b8c40c088c90abb8e3410b92758ed603836d9
Component: engine
2015-07-24 16:10:59 -07:00
Jessica Frazelle
11ea6871f4
fix memory swappiness lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a38b544ef082bcea76c4ea13e19d935ac09d3498
Component: engine
2015-07-24 15:46:51 -07:00
Zhang Kun
9180bba544
#14474 skip DockerSuite.TestRunCapAddCHOWN on lxc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 0547b5fb2ac98d67eea3ed56f4afae87dff3079c
Component: engine
2015-07-24 15:16:07 -07:00
Alexander Morozov
87384af4bd
Merge pull request #14964 from tiborvass/fix-reexec
...
reexec: Use in-memory binary /proc/self/exe on linux instead of os.Args[0]
Upstream-commit: 44e327b29e1dfb699d28cf80bec411597014aa4d
Component: engine
2015-07-24 11:51:56 -07:00
Tibor Vass
d7e24680cc
reexec: Use in-memory binary on linux instead of os.Args[0]
...
This keeps reexec working properly even if the on-disk binary was replaced.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5aee8807a67687941916fc85c6d4da6bc59e834b
Component: engine
2015-07-24 14:15:50 -04:00
Jessie Frazelle
3a3c8d2e29
Merge pull request #14920 from jfrazelle/release-script-updates-for-new-repo
...
warn the script is depreciated
Upstream-commit: e1dea0c4854ba413f492b30f279e217337451034
Component: engine
2015-07-24 11:09:35 -07:00
Jessica Frazelle
4dd6589d1e
warn the script is depreciated
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: ff271f5190c45cb099cb40f72fdae860f9cbb8b3
Component: engine
2015-07-24 10:34:41 -07:00
David Calavera
a7cda977e7
Merge pull request #14958 from LK4D4/fix_valid
...
Fix option validation for log-drivers without it
Upstream-commit: 3a07e7d115626a4658a6c0d222c467c033cf66c3
Component: engine
2015-07-24 09:57:36 -07:00
Tianon Gravi
3fc3a860d8
Merge pull request #14865 from calavera/update_init_scripts
...
Update init scripts to use `docker daemon`.
Upstream-commit: 4eee075f222082940690a385ec62923dd9303909
Component: engine
2015-07-24 09:47:03 -07:00
Alexander Morozov
ffc7323b60
Fix option validation for log-drivers without it
...
There is no option validation for "journald" log-driver, so it makes no
sense to fail in that case.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d68c55bc72625bce226971ef6e760530e9a15ce3
Component: engine
2015-07-24 09:00:53 -07:00
Sebastiaan van Stijn
9bb78c67ff
Merge pull request #14877 from calavera/deprecate_docker_d
...
Add -d to the deprecated feature list for 1.8.
Upstream-commit: f32295eda62192916637d24fe7e3d987c2bc4236
Component: engine
2015-07-24 17:44:23 +02:00
Tibor Vass
e54fe5cfea
Merge pull request #14925 from calavera/fix_volume_symlink_test
...
Remove reference to old Volumes field in inspect struct.
Upstream-commit: 9c0bb22571eca47246a210ddfdae7c7eaedb800f
Component: engine
2015-07-24 10:41:00 -04:00
Sebastiaan van Stijn
fd5b332b83
Merge pull request #14700 from charleswhchan/patch-2
...
Add benefit to using automated build.
Upstream-commit: 58bab11ee298db92fa7db9c99d058b92d58fed54
Component: engine
2015-07-24 08:22:59 +02:00
Charles Chan
f574cabfab
* Add benefit to using automated build.
...
* Wording based on suggestions by @thaJeztah, @moxiegirl in PR #14700 .
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c9ff01ffc74c04d07933118d6275674bdd514c71
Component: engine
2015-07-23 21:01:23 -07:00
Jessie Frazelle
fa96a081c8
Merge pull request #13771 from tiborvass/daemon-cli
...
New `docker daemon` command
Upstream-commit: 7674f2168642f0c9012e20db8ac27ce09ecb2983
Component: engine
2015-07-23 19:30:39 -07:00
moxiegirl
3e3c660339
Merge pull request #14696 from rtrauntvein/patch-1
...
Fix link to examples documentation
Upstream-commit: 163acd07e24a15fb96face9395f9283a47cd3e2f
Component: engine
2015-07-23 18:25:31 -07:00
Jessie Frazelle
599104b3e2
Merge pull request #14926 from dmcgowan/prune-tar-split
...
Fix pruning in vendor script
Upstream-commit: d5e085572d6d85a41c2e01517e8684ad4fcb75ff
Component: engine
2015-07-23 17:43:17 -07:00
Tibor Vass
fbf6d59e07
Update docs to use the new docker daemon command
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e246f1e4eec3290f343627e73a926b940b77b121
Component: engine
2015-07-23 20:31:43 -04:00
Shishir Mahajan
4f814a612a
Add and modify tests for legacy and new daemon invokations
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e7fc632147e40f5a243158e8378082c51a3d952e
Component: engine
2015-07-23 20:31:43 -04:00
Ryan Trauntvein
07938abda9
Add index.md to examples docs
...
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com >
Upstream-commit: 4f62dec548f47634e75ef9a0238de2bddc5bee33
Component: engine
2015-07-23 17:24:44 -07:00
David Calavera
824a07c06c
Merge pull request #14919 from tianon/empty-ps-headers
...
Fix "docker ps" with no containers regression
Upstream-commit: cd9dd552337ea4ca9a007e8a00eb8cd6f74b3143
Component: engine
2015-07-23 16:52:43 -07:00
Tibor Vass
12234c67d4
cli: new daemon command and new cli package
...
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).
The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.
Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.
This patch does not break any old but correct usages.
This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 96ce3a194aab2807fdd638825b9ea7cb9ba55c36
Component: engine
2015-07-23 19:44:46 -04:00
moxiegirl
bbca49004b
Merge pull request #14557 from maaquib/14418-dangling-link-in-runmd
...
Fixing dangling link in docs/reference/commandline/run.md
Upstream-commit: 490e78a642492f25d6c0f7cf1ee855b192d323c7
Component: engine
2015-07-23 16:29:17 -07:00
moxiegirl
bf29f91881
Merge pull request #14589 from paetling/ae-update_net_docs
...
add to docs that ports do not get exposed when using --net
Upstream-commit: ae027c08642621877a93187c0f2b0451df8b71fd
Component: engine
2015-07-23 16:22:21 -07:00
Derek McGowan
8d26f588ee
Keep license files
...
Currently the vendor script removes directories which do not have imported go packages, however this also ends up removing license files which may be other directories.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 82685367d8d5087b16a583123f45fdcb1c7c64dc
Component: engine
2015-07-23 16:12:21 -07:00
David Calavera
b52c35c14d
Remove reference to old Volumes field in inspect struct.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: bb43bdf6c5272976215f74240ffd9db4d5fd2a3a
Component: engine
2015-07-23 16:10:31 -07:00
Derek McGowan
3221713ea7
Fix pruning on tar split
...
Currently the vendor script prunes files which are currently checked in.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a8546df89d1670c0f0edc9dab78cef611b42e929
Component: engine
2015-07-23 15:21:32 -07:00
Alexander Morozov
c4ddbfd5f9
Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm
...
Updated docker-engine.spec to build on Oracle Linux 6.
Upstream-commit: c6f4c192fe33bd04fb2b624c115d176f17de7a06
Component: engine
2015-07-23 13:29:48 -07:00
Tianon Gravi
3dbbf38be7
Fix "docker ps" with no containers regression
...
The header row was not being printed when "docker ps" was invoked without containers thanks to the new format support, and we instead received a single blank line.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: f57fc03e3b39c225a05edfe217bd7616949d0dd0
Component: engine
2015-07-23 13:23:24 -07:00
Stephen Day
71043d24b2
Merge pull request #14831 from duglin/VendorDist
...
Vendor latest distributions so we can use the new errcode stuff
Upstream-commit: 4af94efcf0be5b0fa0da6befd4081badf3d82ba9
Component: engine
2015-07-23 13:17:55 -07:00
Alexander Morozov
3d278636eb
Merge pull request #14034 from hqhq/hq_checkconfig_xattr
...
Some check_config enhancement
Upstream-commit: f28877257bf87a967509933159b16f24846338cb
Component: engine
2015-07-23 13:01:59 -07:00
Vincent Batts
7fa69a889f
Merge pull request #14854 from rhvgoyal/unmount-base
...
docker: Unmount -init layer root before taking a snapshot
Upstream-commit: 1e40915e9d626ba8a00170941886fefab96fa682
Component: engine
2015-07-23 15:17:07 -04:00
moxiegirl
6a78a43641
Merge pull request #14900 from duglin/AddFilterToDoc
...
Add filter to /images/json docs
Upstream-commit: 4e035031b03da375a58bac2263a5eff8ea1acf1a
Component: engine
2015-07-23 11:57:12 -07:00
Phil Estes
7b98273c2e
Merge pull request #14887 from Microsoft/10662-stupidtypo
...
Windows: Stupid copy/paste error
Upstream-commit: 9dcd0cc1ee442ca262491b7738890793be641abc
Component: engine
2015-07-23 14:49:17 -04:00
Doug Davis
f7a16948b8
Do Docker edits so we can use the new distribution code
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b874ef8f43754e5c0fe40b90c3533db93491753e
Component: engine
2015-07-23 10:24:46 -07:00
Doug Davis
ba54a4bec5
Vendor latest distributions so we can use the new errcode stuff
...
ping @stevvooe @RichardScothern
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8b69552b50b0811db077b4bc2583d167e7c8aaec
Component: engine
2015-07-23 10:24:46 -07:00
Tianon Gravi
a9894a24cf
Merge pull request #13933 from ypid/mkimage-no-compression
...
Do not compress rootfs archive in mkimage.sh.
Upstream-commit: 8c2836399338e72eeaaa079a893488c768da97c1
Component: engine
2015-07-23 10:22:07 -07:00
David Calavera
f26842120f
Merge pull request #14855 from ewindisch/apparmor-unconfined
...
Introduce a dedicated unconfined AA policy
Upstream-commit: ac9fc03c74e65a6a18bc0854d4a2841637fe1acf
Component: engine
2015-07-23 10:21:51 -07:00
Jessie Frazelle
1b57972b10
Merge pull request #14903 from jfrazelle/fix-experimental-rpm-debs
...
pass DOCKER_EXPERIMENTAL into build images
Upstream-commit: e5d8fb965815d3037622d74aa8f99e260f6e06a8
Component: engine
2015-07-23 10:05:00 -07:00
David Calavera
3c4c28eff3
Merge pull request #14901 from albers/completion-log-opt-fixes
...
Fixes to bash completion for log driver options
Upstream-commit: 2cf9fec111e86cc9cf2409f398d5092728d54325
Component: engine
2015-07-23 10:03:29 -07:00
Jessica Frazelle
81c6019b8c
pass DOCKER_EXPERIMENTAL into build images
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 76d6751600fe91424171b886fdd87fb3eb3a1380
Component: engine
2015-07-23 09:42:22 -07:00
Sebastiaan van Stijn
238e8e4b51
Merge pull request #14891 from jgeiger/fix_typo_in_builder_docs_for_dockerignore
...
Fix typo in builder.mb .dockerignore example
Upstream-commit: 9e438ffb612c4425026131ea67be5d15a8bdfc45
Component: engine
2015-07-23 18:26:16 +02:00
Sebastiaan van Stijn
70222bd2d9
Merge pull request #14893 from Evalle/14653-fix-sles-issue
...
Fixing SLES12 issue
Upstream-commit: d44e334a6eab31edf2700bf2ca2246b3cfe976a8
Component: engine
2015-07-23 18:22:38 +02:00
Arnaud Porterie
b53aa65918
Merge pull request #14905 from jfrazelle/fix-fedora-install
...
fix fedora release
Upstream-commit: c9937c3a80f3e50437202e17927a8336adf048e8
Component: engine
2015-07-23 09:17:48 -07:00
Jessica Frazelle
b8bceb1145
fix fedora release
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 8192a9ac6cc5b1e010b20185ccef6aecfed7c405
Component: engine
2015-07-23 09:16:35 -07:00
Phil Estes
178131f8bd
Merge pull request #14898 from runcom/sockRequestRaw-close-body
...
Ensure body is closed after error is checked
Upstream-commit: c2346f6406349caabdc5cfefab9efa2bd32881fe
Component: engine
2015-07-23 10:11:44 -04:00
Antonio Murdaca
6fd5a9b231
Ensure body is closed after error is checked
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 18faf6f94e0995ac3fab703d22ca82baf4a65676
Component: engine
2015-07-23 14:34:38 +02:00
Doug Davis
b1387e7404
Add filter to /images/json docs
...
Closes #14894
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a20bf5e61c542fea377345d5318293b44c65cbb5
Component: engine
2015-07-23 05:29:09 -07:00
Harald Albers
f7e4d6020e
Complete all known driver options if no log driver was specified
...
Without this fix, `docker --log-opt ` would not complete anything
because the completions were driver specific.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: de40f3997a7aae94e925d8f694e2161b1b1b92bb
Component: engine
2015-07-23 14:19:13 +02:00
Harald Albers
f7f00cecc7
Fix problem with = in completion of docker global options
...
Without this fix, `docker --log-driver fluentd --log-opt fluentd-tag=b`
would complete `b` to `build`.
Completion of the commands has to be nailed to __docker_pos_first_nonflag
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6de8dd1a6e37ea6ef04d779c6348452c1a3c2370
Component: engine
2015-07-23 13:52:06 +02:00
Jessica Frazelle
Zhang Kun
Alexander Morozov
Tibor Vass
Jessie Frazelle
David Calavera
Tianon Gravi
Alexander Morozov
Sebastiaan van Stijn
Tibor Vass
Charles Chan
moxiegirl
Shishir Mahajan
Ryan Trauntvein
Derek McGowan
Stephen Day
Vincent Batts
Phil Estes
Doug Davis
Arnaud Porterie
Antonio Murdaca
Harald Albers