Commit Graph

20395 Commits

Author SHA1 Message Date
eb95ca4553 Merge pull request #14967 from Microsoft/10662-fixpaniconwindowsdaemon
Windows: Fixes panic on daemon binary
Upstream-commit: 2084eee02c49fba22b2396abc626c1e6c7fc8ec2
Component: engine
2015-07-24 16:48:37 -04:00
3ccb4575e6 Merge pull request #14939 from rtrauntvein/docs-autobuild
Fix broken link in automated build doc
Upstream-commit: 2b847df8c2d06f91cb8969eebc3bb861de184c9c
Component: engine
2015-07-24 13:48:14 -07:00
7b2dff75e4 Carry man page for 14637
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ae45ffc1feef4f2d859f7083a8d64a42c0e74c73
Component: engine
2015-07-24 13:39:29 -07:00
c0e5c2c227 Merge pull request #14835 from aaronlehmann/registry-lint-cleanup
Improve documentation and golint compliance of registry package
Upstream-commit: 84e917b8767c749b9bd1400a5a2253d972635bcf
Component: engine
2015-07-24 16:23:23 -04:00
7ec7d6b833 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>
Upstream-commit: a83e4e4a3411be7ae461408bb1c99f2f9af1f5ee
Component: engine
2015-07-24 13:21:01 -07:00
fe5b9c1f61 Windows: Fixes panic on daemon binary
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b405e89d5cd89d132efef1194a815e670ad15554
Component: engine
2015-07-24 12:30:49 -07:00
4d9279a3fb 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>
Upstream-commit: 4fcb9ac40ce33c4d6e08d5669af6be5e076e2574
Component: engine
2015-07-24 11:55:07 -07:00
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
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
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
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
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
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
03bf3f7ef9 Remove pkg/systemd/booted.go
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: f29dcfd215ae3b3aafda4104339e173b6894544e
Component: engine
2015-07-24 18:09:27 +02:00
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
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
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
d726a9a751 Minor edits to Environment variables section
* Clarify the list of supported instructions.
* Clarify behavior of ONBUILD, based on comments by @SvenDowideit, @theJeztah in PR #14735.
* Reorder list of instructions in alphabetical order.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 42263dafcf05dc598fd98d1b9dd098acb09a4e72
Component: engine
2015-07-24 06:38:55 -07:00
42a4333b5d raise an error if rmi -f with multiple tags and running container
Fixes https://github.com/docker/docker/issues/14116

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 9f7698a63731cd1000c664894e7f48942be16821
Component: engine
2015-07-24 20:44:13 +08:00
a1d7796250 fix the panic caused by resizing a starting exec
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: ba5e0980527d3477cb85925e07eecb28dfe50e08
Component: engine
2015-07-24 20:43:07 +08:00
7f686f0d54 Rename internel field Relabel to Mode
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4cb9479ce490408daae2ffc2b7d28ad181ce24c3
Component: engine
2015-07-24 07:14:37 -04:00
87314dfb81 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>
Upstream-commit: 1fb29e6c3c13127912d1de9233f2aaaf63ec0ee8
Component: engine
2015-07-24 11:57:18 +02:00
Lei
26ba48c09d Add VxFS magic number, fixes #14847
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: e1c5e9b5610e46bf9526dafcbfba3332fe1983e0
Component: engine
2015-07-24 16:37:56 +08:00
6e333c54df Vendor notary
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f5a4a8da15f5cbe6abf8d7b67211c75791c78ebf
Component: engine
2015-07-24 01:31:50 -07:00
ffb11d4bf7 Add cmdline docs for signing and verification flows
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
Upstream-commit: 48250832a3dd4b93ee7f61035b5b8176febfb55f
Component: engine
2015-07-24 01:31:50 -07:00
0e9fea3c70 Remove unnecessary container cleanup in integration-cli
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: bcc0968a2c9b5feef2c09b097c461a80b50ac19a
Component: engine
2015-07-24 14:48:26 +08:00
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
a375cbd8f0 Fix broken link in automated build doc
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
Upstream-commit: 8e66e627d701101e583c31fba419b0ae8cf2fb89
Component: engine
2015-07-23 23:12:06 -07:00
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
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
485074d55d 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>
Upstream-commit: 24f7d0afc9b62da1684e5bf9998ad927aec37cb0
Component: engine
2015-07-23 19:09:20 -07:00
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
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
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
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
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
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
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
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
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
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
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
ef42dd327d daemon/graphdriver/btrfs fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 17c19f395f4d88c70f33119e01a077ca1fdb5c1d
Component: engine
2015-07-23 22:48:45 +00:00
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
219631f054 Fix typo.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 59e48b346848a131d85a808fa1e21aea8c4f9833
Component: engine
2015-07-24 08:14:06 +10:00
89bac51dfe Switch to using only the RPM command to determine the distro version.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: a43199f14314b3d966e5723cd336f9747a0f1ca0
Component: engine
2015-07-24 07:38:28 +10:00
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
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
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
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