Arnaud Porterie
542685d856
Merge pull request #14976 from calavera/revert_unconfined_aa_policy
...
Revert "Introduce a dedicated unconfined AA policy"
2015-07-24 17:31:28 -07:00
Arnaud Porterie
78906612a2
Merge pull request #14935 from stevvooe/registry-moratorium
...
Impose moratorium on remote registry access
2015-07-24 16:45:05 -07:00
Jessie Frazelle
935810bd20
Merge pull request #14977 from jfrazelle/fix-lxc
...
fix lxc
2015-07-24 16:43:46 -07:00
David Calavera
94ab0d312f
Revert "Introduce a dedicated unconfined AA policy"
...
This reverts commit 87376c3add
.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-24 16:35:51 -07:00
Jessica Frazelle
0a5b8c40c0
ignore certain tests on lxc driver
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-24 16:10:59 -07:00
Jessie Frazelle
5ab4b60e11
Merge pull request #14969 from tianon/utopic-eol
...
Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
2015-07-24 15:48:34 -07:00
Jessica Frazelle
a38b544ef0
fix memory swappiness lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-24 15:46:51 -07:00
Zhang Kun
0547b5fb2a
#14474 skip DockerSuite.TestRunCapAddCHOWN on lxc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-07-24 15:16:07 -07:00
Sebastiaan van Stijn
86c7ea4863
Merge pull request #14637 from metalivedev/patch-1
...
Document that load supports compressed tarballs.
2015-07-24 23:38:43 +02:00
Sebastiaan van Stijn
d951ef128f
Merge pull request #14522 from carlossg/patch-1
...
Clarify filters option in list containers doc
2015-07-24 23:13:32 +02:00
Doug Davis
2084eee02c
Merge pull request #14967 from Microsoft/10662-fixpaniconwindowsdaemon
...
Windows: Fixes panic on daemon binary
2015-07-24 16:48:37 -04:00
moxiegirl
2b847df8c2
Merge pull request #14939 from rtrauntvein/docs-autobuild
...
Fix broken link in automated build doc
2015-07-24 13:48:14 -07:00
Tibor Vass
84e917b876
Merge pull request #14835 from aaronlehmann/registry-lint-cleanup
...
Improve documentation and golint compliance of registry package
2015-07-24 16:23:23 -04:00
Tianon Gravi
a83e4e4a34
Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
...
As of July 23, 2015, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2015-July/000198.html ) and will receive no further updates.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-07-24 13:21:01 -07:00
John Howard
b405e89d5c
Windows: Fixes panic on daemon binary
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-24 12:30:49 -07:00
Aaron Lehmann
4fcb9ac40c
Improve documentation and golint compliance of registry package
...
* Add godoc documentation where it was missing
* Change identifier names that don't match Go style, such as INDEX_NAME
* Rename RegistryInfo to PingResult, which more accurately describes
what this structure is for. It also has the benefit of making the name
not stutter if used outside the package.
Updates #14756
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-24 11:55:07 -07:00
Alexander Morozov
44e327b29e
Merge pull request #14964 from tiborvass/fix-reexec
...
reexec: Use in-memory binary /proc/self/exe on linux instead of os.Args[0]
2015-07-24 11:51:56 -07:00
Tibor Vass
5aee8807a6
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>
2015-07-24 14:15:50 -04:00
Jessie Frazelle
e1dea0c485
Merge pull request #14920 from jfrazelle/release-script-updates-for-new-repo
...
warn the script is depreciated
2015-07-24 11:09:35 -07:00
Jessica Frazelle
ff271f5190
warn the script is depreciated
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-24 10:34:41 -07:00
David Calavera
3a07e7d115
Merge pull request #14958 from LK4D4/fix_valid
...
Fix option validation for log-drivers without it
2015-07-24 09:57:36 -07:00
Tianon Gravi
4eee075f22
Merge pull request #14865 from calavera/update_init_scripts
...
Update init scripts to use `docker daemon`.
2015-07-24 09:47:03 -07:00
Alexander Morozov
d68c55bc72
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>
2015-07-24 09:00:53 -07:00
Sebastiaan van Stijn
f32295eda6
Merge pull request #14877 from calavera/deprecate_docker_d
...
Add -d to the deprecated feature list for 1.8.
2015-07-24 17:44:23 +02:00
Tibor Vass
9c0bb22571
Merge pull request #14925 from calavera/fix_volume_symlink_test
...
Remove reference to old Volumes field in inspect struct.
2015-07-24 10:41:00 -04:00
Carlos Sanchez
1fb29e6c3c
Clarify filters option in list containers and list images docs
...
Based on the list containers with filters options it would seem that filtering containers with label `test=docker-java` could be done with `{"test":["docker-java"]}` which doesn't work
The options that work are `{"label":["test"]}` and `{"label":["test=docker-java"]}`
As seen in https://github.com/docker-java/docker-java/pull/262
Signed-off-by: Carlos Sanchez <carlos@apache.org>
2015-07-24 11:57:18 +02:00
Sebastiaan van Stijn
58bab11ee2
Merge pull request #14700 from charleswhchan/patch-2
...
Add benefit to using automated build.
2015-07-24 08:22:59 +02:00
Ryan Trauntvein
8e66e627d7
Fix broken link in automated build doc
...
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
2015-07-23 23:12:06 -07:00
Charles Chan
c9ff01ffc7
* 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>
2015-07-23 21:01:23 -07:00
Jessie Frazelle
7674f21686
Merge pull request #13771 from tiborvass/daemon-cli
...
New `docker daemon` command
2015-07-23 19:30:39 -07:00
Stephen J Day
24f7d0afc9
Impose moratorium on remote registry access
...
A moratorium has been added to the road map to add a moratorium on adding
remote registry access to commands that don't already do so.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-07-23 19:09:20 -07:00
moxiegirl
163acd07e2
Merge pull request #14696 from rtrauntvein/patch-1
...
Fix link to examples documentation
2015-07-23 18:25:31 -07:00
Jessie Frazelle
d5e085572d
Merge pull request #14926 from dmcgowan/prune-tar-split
...
Fix pruning in vendor script
2015-07-23 17:43:17 -07:00
Tibor Vass
e246f1e4ee
Update docs to use the new `docker daemon` command
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-23 20:31:43 -04:00
Shishir Mahajan
e7fc632147
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>
2015-07-23 20:31:43 -04:00
Ryan Trauntvein
4f62dec548
Add index.md to examples docs
...
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
2015-07-23 17:24:44 -07:00
David Calavera
cd9dd55233
Merge pull request #14919 from tianon/empty-ps-headers
...
Fix "docker ps" with no containers regression
2015-07-23 16:52:43 -07:00
Tibor Vass
96ce3a194a
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>
2015-07-23 19:44:46 -04:00
moxiegirl
490e78a642
Merge pull request #14557 from maaquib/14418-dangling-link-in-runmd
...
Fixing dangling link in docs/reference/commandline/run.md
2015-07-23 16:29:17 -07:00
moxiegirl
ae027c0864
Merge pull request #14589 from paetling/ae-update_net_docs
...
add to docs that ports do not get exposed when using --net
2015-07-23 16:22:21 -07:00
Derek McGowan
82685367d8
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)
2015-07-23 16:12:21 -07:00
David Calavera
bb43bdf6c5
Remove reference to old Volumes field in inspect struct.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-23 16:10:31 -07:00
Derek McGowan
a8546df89d
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)
2015-07-23 15:21:32 -07:00
Alexander Morozov
c6f4c192fe
Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm
...
Updated docker-engine.spec to build on Oracle Linux 6.
2015-07-23 13:29:48 -07:00
Tianon Gravi
f57fc03e3b
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>
2015-07-23 13:23:24 -07:00
Stephen Day
4af94efcf0
Merge pull request #14831 from duglin/VendorDist
...
Vendor latest distributions so we can use the new errcode stuff
2015-07-23 13:17:55 -07:00
Alexander Morozov
f28877257b
Merge pull request #14034 from hqhq/hq_checkconfig_xattr
...
Some check_config enhancement
2015-07-23 13:01:59 -07:00
Vincent Batts
1e40915e9d
Merge pull request #14854 from rhvgoyal/unmount-base
...
docker: Unmount -init layer root before taking a snapshot
2015-07-23 15:17:07 -04:00
moxiegirl
4e035031b0
Merge pull request #14900 from duglin/AddFilterToDoc
...
Add filter to /images/json docs
2015-07-23 11:57:12 -07:00
Phil Estes
9dcd0cc1ee
Merge pull request #14887 from Microsoft/10662-stupidtypo
...
Windows: Stupid copy/paste error
2015-07-23 14:49:17 -04:00