Commit Graph

511 Commits

Author SHA1 Message Date
296e59632a Merge pull request #19170 from aaronlehmann/delete-prune-digests
Prune digest references when deleting by tag
Upstream-commit: c0c66c57b2d898e43f7dd74ad9f2f256ea5dfcdf
Component: engine
2016-01-12 15:15:36 -08:00
eb73b224c4 Prune digest references when deleting by tag
When pulling an image with content trust enabled, two references are
created: a digest reference and a tag reference. Deleting by tag
wouldn't actually remove the image, because the digest reference keeps
it alive.

This change modifies the rmi logic so that digest references don't keep
an image alive. If the last tag referencing a given image is deleted,
any digest references to it will be removed as well, so the image can
actually get deleted. This fixes the usability problem with deletions
when content trust is in use, so something like "docker pull busybox;
docker rmi busybox" will work as expected.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2f048f73e122ab90b8f35a088b4be52bd255caad
Component: engine
2016-01-12 12:11:43 -08:00
41680fdf37 Merge pull request #19104 from vdemeester/18957-update-config
Add a specific config struct for the update command (#18957)
Upstream-commit: 1393c450cd8b4b7143a069ac062fd2adc6e02ca0
Component: engine
2016-01-12 09:46:19 -08:00
4a64d99bbc Merge pull request #19187 from estesp/lets-do-this
User namespaces: graduate from experimental
Upstream-commit: c72be040bb893e49bb12baf7e688c88b635d8ea1
Component: engine
2016-01-12 09:34:19 -08:00
e2b2a71502 Merge pull request #18906 from coolljt0725/connect_to_created
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
62a5091381 Add a specific config for the update command
This allows to define clearly what is mutable or not in a container
and remove the use of the internal HostConfig struct to be used.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a4f6920731c6af27a7e89c3da8d0e6fd309de90a
Component: engine
2016-01-12 08:33:41 +01:00
cae7fb6550 Add daemon documentation on user namespaces feature
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: cc63db4fd19f99372a84cc97a87a023fa9193734
Component: engine
2016-01-11 20:54:57 -05:00
3340505b84 Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port
Fix ambassador script
Upstream-commit: 3f1b16e236ad4626e02f3da4643023454d7dbb3f
Component: engine
2016-01-11 17:41:53 -08:00
e46c089f56 Merge pull request #18998 from calavera/syslog_tls
Allow syslog over TCP+TLS.
Upstream-commit: 656979670c5225753ad8d0c6d2bb1ab1a82b0b56
Component: engine
2016-01-11 17:21:38 -08:00
3b26d1d1d4 Add docker network connect/disconnect to non-running container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
35f8dfbc72 List engine-api in the client libraries reference.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bce01398dda39e551a39f287224189f70accaf80
Component: engine
2016-01-11 19:17:13 -05:00
1c0d76c749 Add support for syslog over TLS.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 4b98193beab00bc6cf48762858570a1bd418c9ef
Component: engine
2016-01-11 12:25:34 -05:00
a478ae86ba Merge pull request #19167 from vieux/bring_discovery_on_par
Bring discovery on par with the one in docker/swarm
Upstream-commit: c49ccd319249610eb05f0c430b26d7c82383bf76
Component: engine
2016-01-08 22:54:01 -08:00
7ad15b069e Fix ambassador script based on SvenDowideit/dockerfiles#37
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: cc44ea21e481d34ab9621afd6944b6c14a23106a
Component: engine
2016-01-08 20:55:22 +00:00
7467c1af44 Allow user to choose the IP address for the container
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
5831ef280d man page fix: remove -e/--exec-drive=native related description
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 50305d66f56774488b6fec2534fd592c263c91e0
Component: engine
2016-01-07 14:21:01 -05:00
6a1af5c70c Merge pull request #19144 from LK4D4/fix_parent_systemd
Choose default-cgroup parent by cgroup driver
Upstream-commit: 938d28e772ec32ed3b09bfb8907852e497990076
Component: engine
2016-01-07 10:24:51 -08:00
d9a92e1dc3 Choose default-cgroup parent by cgroup driver
It's "/docker" for cgroupfs and "system.slice" for systemd.

Fix #19140

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c1cd45d547ef26cf988dc72d456430361dafcf08
Component: engine
2016-01-07 08:56:26 -08:00
c4d25ca65c added documentation for groupadd within hostConfig that was added in remote api 1.20
Signed-off-by: Oliver Neal <ItsVeryWindy@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ade71ace7df285795381d1317f8069f14e099bb3
Component: engine
2016-01-07 12:30:27 +01:00
25ac09e895 Merge pull request #19090 from thaJeztah/fix-api-markdown
fix markdown and typos in API docs
Upstream-commit: 3442339b98dccc7137ea8d49393eff44166a67ec
Component: engine
2016-01-07 08:32:01 +01:00
e860be63e2 Before that change, etcd and zookeeper would fail to instantiate
the discovery without the key being already there in the store or
created beforehand and implicitely by a 'swarm join'.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>

This PR allows to configure the discovery path using the
--discovery-opt flag (with "kv.path=path/to/nodes"). We
can point to "docker/nodes" and use the docker discovery.

If docker instances are advertising to the cluster using
the `--cluster-advertise` flag, the swarm join command
becomes unnecessary.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a931c78540bdecbbe13302ec5156ef832e152994
Component: engine
2016-01-06 05:18:52 -08:00
caf108c7a2 Merge pull request #19045 from wenchma/network_api_update
Update docker network api doc
Upstream-commit: 180ff8d5015d60f1d1d7c9838d476ca5e4fc6117
Component: engine
2016-01-05 10:55:56 -08:00
40a92806fd fix markdown and typos in API docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 72472f5639fc92f3fd554e4eb860b0cb6938f7c2
Component: engine
2016-01-05 16:33:32 +01:00
ba6c4901c7 Merge pull request #19070 from softprops/shiplift_client
add shiplift docker client to remote api client list
Upstream-commit: 09ad1bbc5897e34c6e6d5612b0e1ba709ed28a7d
Component: engine
2016-01-05 14:36:30 +01:00
738f0e36b5 add shiplift docker client to remote api client list
Signed-off-by: Doug Tangren <d.tangren@gmail.com>
Upstream-commit: 09e0c9fc24db44217885c58fb6023bcfef211ae0
Component: engine
2016-01-05 08:27:26 -05:00
d4f5e05d82 Fix the unnecessary parameter
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 52b944dbba74b7d2be5bcabfe6937a5578020101
Component: engine
2016-01-05 10:26:01 +00:00
0c89fbf389 Add ability to set cgroup parent for all containers
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
2016-01-04 15:16:25 -08:00
58e545b6bf Merge pull request #18888 from calavera/event_types
Event all the things!
Upstream-commit: 723be0a3325799fd6b2a6b689af54f5a07edf992
Component: engine
2016-01-04 13:07:33 -08:00
c2e5fdc393 Add filter by event type and documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 851fe00c64ffafeb27b12f7b0ed8e41f7720b477
Component: engine
2016-01-04 14:58:04 -05:00
7489ecd35e Fix pid=host example in documentation
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.

This updates the example to use htop (strace is
not working without disabling apparmor for the container)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9b6592ca858a23376b838e9808d7fa3f15ebc381
Component: engine
2016-01-04 16:25:54 +01:00
cf1cf1d767 Update docker network api doc
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: d92d1de3d529343317e47f604963e5ad8476b3e6
Component: engine
2016-01-04 18:05:02 +08:00
1162375d21 Merge pull request #15666 from vdemeester/3519-configurable-escape
Implement configurable escape key for attach/exec
Upstream-commit: db738dd77f699e93f976441d5fc11ab48a2d6c68
Component: engine
2016-01-04 00:49:07 +01:00
5582f5eb83 Implement configurable detach key
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 15aa2a663b47b6126a66efefcadb64edfbffb9f5
Component: engine
2016-01-03 23:03:39 +01:00
c32d38aa18 Merge pull request #18387 from wenchma/18385-improve_help_msg
Improvement for docker subcommand's help messages
Upstream-commit: 9d6c2196b54a20cef3ede074d521ccb6bdabbe63
Component: engine
2016-01-03 12:19:53 +01:00
8a76cb28e3 Merge pull request #18932 from wenchma/same_name_of_container_image
Update integration tests when container and image have same name
Upstream-commit: 1a5b97c76143b7d26006916b23daf8fde73c35ac
Component: engine
2016-01-01 21:40:51 +01:00
b350f7594e Improvement for docker subcommand's help messages
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: d7dc439623ff18d2a8dd152dbb032a307100cb2e
Component: engine
2016-01-01 12:27:28 +08:00
301494dba6 Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
2015-12-30 21:01:48 +01:00
c8d08c88b3 Fix docs for memory-swap
Fixes: #18894

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c68a483e442758733e800546545f1e016113d9cd
Component: engine
2015-12-30 09:23:35 +08:00
9d5c330d8f Fix typo in daemon storage-driver docs
Signed-off-by: Thomas Swift <tgs242@gmail.com>
Upstream-commit: c44a8d8d8c9eccb79b16c874f083cd9597c3f6ca
Component: engine
2015-12-29 17:06:02 -05:00
4b86854122 Update integration tests when container and image have same name
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9fbb1306e83576086e924ff4fbf35b9a74beb28a
Component: engine
2015-12-29 11:08:31 +08:00
c4af30652d Implemet docker update command
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
743bbc7202 remove =false from options that default to false in the docs
This re-aligns the docs with what the cmd line now does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: e6115a6c1c02768898b0a47e550e6c67b433c436
Component: engine
2015-12-23 07:11:35 -08:00
6f10e6b229 Add filter for network ls to hide predefined net
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 26dd026bd70c9c18a16b0e339821c309e56d8ff0
Component: engine
2015-12-23 13:26:40 +08:00
161c03c6c1 Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
306ef7b263 Merge pull request #17692 from vdemeester/images-format
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
2015-12-21 09:57:29 -08:00
f41d29a49b Add --format support to images command
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 34a3c3cacf2fd827f13a5e37541acff1409658c4
Component: engine
2015-12-21 17:38:07 +01:00
1c5df6581b Change the quiet flag behavior in the build command
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
a04e1f9592 Add support for blkio read/write iops device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 843084b08b521a70baf9284ec4e23e941ab38367
Component: engine
2015-12-21 09:14:49 +08:00
13594ddd74 Update restart description
add a note around restart policies only working in detached mode

Signed-off-by: Aidan Feldman <aidan.feldman@gmail.com>

Update restart description with Mary's comments.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c32ec8b93b199168425f29cab040d9d8cc23566f
Component: engine
2015-12-21 00:58:30 +01:00
bfd2cf3356 Merge pull request #18667 from bboreham/inspect-json-doc
Improved explanation of docker inspect 'json' function
Upstream-commit: fa720ad98746eb33073af9f4fde16df4f774644f
Component: engine
2015-12-19 21:09:39 -08:00