Commit Graph

135 Commits

Author SHA1 Message Date
d0accd62d9 Add capability to specify mount propagation per volume
Allow passing mount propagation option shared, slave, or private as volume
property.

For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: b2cbaa03af
Component: cli
2017-06-02 00:07:20 +00:00
1c4c464a30 Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: b91f98d9f1
Component: cli
2017-06-02 00:07:20 +00:00
cf2cd0632d Change authz plugin argument name
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 53c1cb81c0
Component: cli
2017-06-02 00:07:20 +00:00
4c35bc9676 Fixing documentation comments by @thaJeztah
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: a8a3c47ee5
Component: cli
2017-06-02 00:07:20 +00:00
f15205a41d newtork -> network (minor spelling correction)
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
Upstream-commit: 66eef79e58
Component: cli
2017-06-02 00:07:19 +00:00
8c726d1e3f Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 9480c4763d
Component: cli
2017-06-02 00:07:19 +00:00
3701e83b63 Add format flag to network inspect
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c6162061d9
Component: cli
2017-06-02 00:07:19 +00:00
131de84a7e Address review comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c5f725e1c7
Component: cli
2017-06-02 00:07:19 +00:00
d37fd961d4 Add docs and man page entry for --volume-driver
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 22ce4b4448
Component: cli
2017-06-02 00:07:19 +00:00
372ae86505 Add NETWORK_NAME_or_ID value for --net= option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: deae0706ea
Component: cli
2017-06-02 00:07:19 +00:00
98ddc49784 Add OomScoreAdj to configure container oom killer preferences
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e9287cd43a
Component: cli
2017-06-02 00:07:19 +00:00
16c00f11eb This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 65120e8851
Component: cli
2017-06-02 00:07:18 +00:00
6e75b48631 Improvement of docker top Man Page
Some users expect that the `docker top $CONT` command displays information from the inside container perspective.
They expect that the `docker top $CONT` command displays same information as the `docker exec $CONT ps -ef` command. But it does not.

That's why the `docker top` man page shall explicitly state that the `docker top $CONT` displays information from the host's point of view.

Signed-off-by: Pavel Pospisil <pospispa@gmail.com>
Upstream-commit: 70efcb00b4
Component: cli
2017-06-02 00:07:18 +00:00
317ce91965 Deprecate -f flag from docker tag
Closes #9798

@maintainers please note that this is a change to the UX. We no longer
require the -f flag on `docker tag` to move a tag from an existing image.
However, this does make us more consistent across our commands,
see https://github.com/docker/docker/issues/9798 for the history.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ecfc3613b2
Component: cli
2017-06-02 00:07:18 +00:00
00c64032bc Add docs for option --isolation
Add docs for `run`/`create`/`build` command option `isolation`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 67eea4d814
Component: cli
2017-06-02 00:07:18 +00:00
e3edcc1609 Add API change to docs
Add API change description to docs due to `docker network inspect`
returns different data structure.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 87ba148cab
Component: cli
2017-06-02 00:07:18 +00:00
c1135453ba Enhance docker network rm to delete multi net
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 007df1d494
Component: cli
2017-06-02 00:07:18 +00:00
3b49273779 Add '-L' option for cp
Fixes #16555

Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 92d0c4bc45
Component: cli
2017-06-02 00:07:18 +00:00
6dc1204713 modifying docker --since and --until to support nanoseconds and time zones
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: 0eb79491dd
Component: cli
2017-06-02 00:07:18 +00:00
c182950c75 Re-implement --before and --since as options for --filter
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 562c2df97d
Component: cli
2017-06-02 00:07:18 +00:00
4000ade31b Addition of "--shm-size" to which size of /dev/shm is changed.
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
Upstream-commit: fa2f024bc6
Component: cli
2017-06-02 00:07:18 +00:00
9c2296cf9c Add pkg/parsers/architecture and pkg/platform
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8ab8a0f3c5
Component: cli
2017-06-02 00:07:17 +00:00
e68ca3e6e8 /info: Add keys Architecture, OSType
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 1de6fda301
Component: cli
2017-06-02 00:07:17 +00:00
b13bcd56d3 Relabel BTRFS Content on container Creation
This change will allow us to run SELinux in a container with
BTRFS back end.  We continue to work on fixing the kernel/BTRFS
but this change will allow SELinux Security separation on BTRFS.

It basically relabels the content on container creation.

Just relabling -init directory in BTRFS use case. Everything looks like it
works. I don't believe tar/achive stores the SELinux labels, so we are good
as far as docker commit.

Tested Speed on startup with BTRFS on top of loopback directory. BTRFS
not on loopback should get even better perfomance on startup time.  The
more inodes inside of the container image will increase the relabel time.

This patch will give people who care more about security the option of
runnin BTRFS with SELinux.  Those who don't want to take the slow down
can disable SELinux either in individual containers or for all containers
by continuing to disable SELinux in the daemon.

Without relabel:

> time docker run --security-opt label:disable fedora echo test
test

real    0m0.918s
user    0m0.009s
sys    0m0.026s

With Relabel

test

real    0m1.942s
user    0m0.007s
sys    0m0.030s

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 212fe5f2d0
Component: cli
2017-06-02 00:07:17 +00:00
c6c59e87c6 Supported added for reterving Plugin list for Network and Volume.
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
Upstream-commit: b1287de07b
Component: cli
2017-06-02 00:07:17 +00:00
3804fbd740 Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: e303d6cc9f
Component: cli
2017-06-02 00:07:17 +00:00
29e36723a8 docker-login man/doc add security info
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: d6bac18914
Component: cli
2017-06-02 00:07:17 +00:00
5728fa8a19 Fix man pages
Add contents and fix format problem for man pages.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 1a495e2d47
Component: cli
2017-06-02 00:07:16 +00:00
3222bcadf4 Allow docker stats without arguments
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4668b6ed6c
Component: cli
2017-06-02 00:07:16 +00:00
50fbc6f6bd Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f9b805f16f
Component: cli
2017-06-02 00:07:15 +00:00
5ab60b10fd Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c5ed875bd9
Component: cli
2017-06-02 00:07:15 +00:00
71b2b853cc Fix docs typo and wrong word
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: e8a0a5c4f4
Component: cli
2017-06-02 00:07:15 +00:00
ce4e79a2a8 Change 'docker run' exit codes to distinguish docker/contained errors
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: c48ec056d5
Component: cli
2017-06-02 00:07:15 +00:00
b4acd55a6d Updating networking docs with technical information
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2d486b08c8
Component: cli
2017-06-02 00:07:15 +00:00
8050e305f6 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 02a859b9f3
Component: cli
2017-06-02 00:07:15 +00:00
b0b9294f03 Updating network commands: adding man pages
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4985b20ea1
Component: cli
2017-06-02 00:07:15 +00:00
3be895e8da Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 1e2a27568b
Component: cli
2017-06-02 00:07:14 +00:00
e16c15092c Add ability to add multiple tags with docker build
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 9d9976ae3a
Component: cli
2017-06-02 00:07:14 +00:00
eb88c834cf MINOR typo fix.
Signed-off-by: GabrielNicolasAvellaneda <avellaneda.gabriel@gmail.com>
Upstream-commit: aa9830907a
Component: cli
2017-06-02 00:07:13 +00:00
80cce1f5ce Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c506e1df7
Component: cli
2017-06-02 00:07:13 +00:00
e15d2f0090 use Server Version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: dd1d35285b
Component: cli
2017-06-02 00:07:13 +00:00
a1b4133afe add clarity to -p option
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 445552696c
Component: cli
2017-06-02 00:07:13 +00:00
9a66bfc2e3 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: de3e44577a
Component: cli
2017-06-02 00:07:12 +00:00
900900b4d7 updating docs for EXPOSE option on run command; fixes #16634
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: d83594a46d
Component: cli
2017-06-02 00:07:12 +00:00
9c1b81f536 various man page typos
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: f7a88ba8a8
Component: cli
2017-06-02 00:07:12 +00:00
f6c311219b Document updates for cluster-store-opt
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f10d93f394
Component: cli
2017-06-02 00:07:12 +00:00
fb5c95b1a3 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0095e6fc23
Component: cli
2017-06-02 00:07:12 +00:00
9250a37135 add clarity/fix typos man/docker-build
add needed clarity for
1)  using STDIN to pass build context
2)  --cpu-shares flag use

also a few typos

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 40ec99e60a
Component: cli
2017-06-02 00:07:12 +00:00
d7d36514c0 man update for docker run with host volumes
Signed-off-by: Mike Brown <brownwm@us.ibm.com>

cleaning up docker run -v documentation for man and web reference guide

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: b5a037443d
Component: cli
2017-06-02 00:07:11 +00:00
49b87bae2e Sync with remote API
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also container events

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also man page

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Upstream-commit: f8a62fd1c5
Component: cli
2017-06-02 00:07:11 +00:00