1
0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Commit Graph

353 Commits

Author SHA1 Message Date
Huu Nguyen
e381bb96ca Fix apparent copy paste mistake
The note under the RUN header refers to the CMD instruction. It should refer to the RUN instruction instead.

Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
Upstream-commit: 86e72c6e06
Component: cli
2017-06-02 00:06:39 +00:00
Malte Janduda
829695e78b enhancing set-macaddress docu #2
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 7a545897fe
Component: cli
2017-06-02 00:06:39 +00:00
Malte Janduda
1eb6ea9888 enhancing set-macaddress docu
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: a9e9f21f0f
Component: cli
2017-06-02 00:06:39 +00:00
Malte Janduda
93b94d46f6 Adding docker-cli run param to set MAC address
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: ad1a9d8d2f
Component: cli
2017-06-02 00:06:39 +00:00
Arnaud Porterie
2c48eb8298 Clarify USER instruction documentation
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7caa149d5f
Component: cli
2017-06-02 00:06:39 +00:00
Srini Brahmaroutu
b0ca1476df adding support for port ranges on --expose
Closes #1834

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 5b9405b388
Component: cli
2017-06-02 00:06:39 +00:00
Lei Jitang
98446ec813 Fix docker exec command help messages
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 01b86d0d32
Component: cli
2017-06-02 00:06:39 +00:00
Victor Vieux
a312a1076d add missing 'current filter' to ps
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 39b226dc84
Component: cli
2017-06-02 00:06:39 +00:00
Huayi Zhang
f1eebaa357 Mapping change in code
Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 166109859e
Component: cli
2017-06-02 00:06:39 +00:00
Huayi Zhang
d89be4ab41 Add docs for --dns-search=.
PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: deabfbc88f
Component: cli
2017-06-02 00:06:39 +00:00
Fred Lifton
a4a835cb0f Adds new Docs Style Guide.
Includes changes to mkdocs yml and removes style info from docs Read Me, adding a link instead.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

Conflicts:
	docs/README.md

Revisions to style guide based on review.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

More Style Guide revisions based on review.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

A few more style guide copy edits

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: c90e4b1bc5
Component: cli
2017-06-02 00:06:37 +00:00
Jessica Frazelle
d8ba847ba4 Adding self to various maintainers files.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d83b068933
Component: cli
2017-06-02 00:06:37 +00:00
Fred Lifton
31abb69581 Tweaks to Dockerfile tutorial
Made a few tweaks to Dockerfile tutorial links and removed some cruft from the tutorial itself.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: a6ba3f585b
Component: cli
2017-06-02 00:06:37 +00:00
Andrea Luzzardi
0243ab522c Expose # of CPUs and memory available on docker info.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 588d30ecca
Component: cli
2017-06-02 00:06:37 +00:00
Erik Hollensbe
ab2803a8e5 builder: Update documentation WRT environment replacement
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 15192a0bc1
Component: cli
2017-06-02 00:06:37 +00:00
Sven Dowideit
e55b45b1a6 Rewrite ENTRYPOINT documentation covering all the combinations with examples.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 9efb51fbc1
Component: cli
2017-06-02 00:06:37 +00:00
Sven Dowideit
5e95091151 Link to run reference from cli doc
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: aedfc62293
Component: cli
2017-06-02 00:06:37 +00:00
Vincent Bernat
be92ef689d zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

The major change since the last merge is the addition of
exec/create (but they were already present in the docker repository) as
well as pause/unpause/logout/events and the use of short/long options
when they are available. Some missing options were also added.

12f00abd7178 Add completion for `exec'
4e2faa075f9a Merge `run' and `create' commands.
34134de077de Add missing long/short options for most commands.
d09f62339ab5 Add completion for `pause' and `unpause'
e4754c3b3b9d Add completion for `logout'
e0935eb3d5d2 Add completion for `events'
dae353cb9afb Add completion for `create`

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: c55facc917
Component: cli
2017-06-02 00:06:37 +00:00
Madhu Venugopal
6b65799e84 Fixed a minor docs issue in a Dockerfile Example
The Dockerfile Instruction to create the .vnc directory results in a failure :
-storepasswd failed for file: /root/.vnc/passwd

Signed-off-by: Madhu Venugopal <madhu@socketplane.io>
Upstream-commit: a6594e13ce
Component: cli
2017-06-02 00:06:37 +00:00
Harald Albers
5d0a93226f Fix support for --env-file in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f1a49f2560
Component: cli
2017-06-02 00:06:37 +00:00
Ryan Detzel
26175343ba Docs syntax fix
the flags must come before the container name.
Upstream-commit: ff38494bbe
Component: cli
2017-06-02 00:06:37 +00:00
Sven Dowideit
8f6a45b8f7 Add info on --device flag permissions ':rwm'
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 981a612adf
Component: cli
2017-06-02 00:06:37 +00:00
Tibor Vass
5d203350cb Rewrite documentation for insecure registries
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/reference/commandline/cli.md
Upstream-commit: d227c88e19
Component: cli
2017-06-02 00:06:37 +00:00
Tibor Vass
ef8ce68f4e Add the possibility of specifying a subnet for --insecure-registry
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
Upstream-commit: 5b491e6942
Component: cli
2017-06-02 00:06:36 +00:00
Tibor Vass
da915828c4 Docs edits for dropping SSLv3 and under + release notes for 1.3.1
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/index.md
Upstream-commit: f58767aced
Component: cli
2017-06-02 00:06:36 +00:00
Tibor Vass
e49075d737 Do not verify certificate when using --insecure-registry on an HTTPS registry
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry.go
	registry/registry_test.go
	registry/service.go
	registry/session.go
Upstream-commit: 8d6cc5b994
Component: cli
2017-06-02 00:06:36 +00:00
Michael Crosby
fe3d69425b Expand documentation for --insecure-registries
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c773557121
Component: cli
2017-06-02 00:06:36 +00:00
unclejack
20491c04c2 make http usage for registry explicit
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/config.go
	daemon/daemon.go
	graph/pull.go
	graph/push.go
	graph/tags.go
	registry/registry.go
	registry/service.go
Upstream-commit: 15490a58b2
Component: cli
2017-06-02 00:06:36 +00:00
SvenDowideit
20075627ab Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Add some information about the storage and execution driver choices

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 22c0b17eb2
Component: cli
2017-06-02 00:06:36 +00:00
Sven Dowideit
6be37a99f8 Mention the mkdocs.yml file for adding new documents
and move the complicated discussion about branches lower down,
hopefully most won't need to know

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: eecd9e7003
Component: cli
2017-06-02 00:06:36 +00:00
Aanand Prasad
c2df77647a Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
This makes it possible to make the Docker client "secure by default"
without wrapping the binary in a shell alias so that `--tlsverify` is
always passed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 57d75938cd
Component: cli
2017-06-02 00:06:36 +00:00
Sven Dowideit
0d447af2a5 Add more info on attach inspired by discussion in #2855
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: c5e74b80e2
Component: cli
2017-06-02 00:06:36 +00:00
Doug Davis
7e0af2af23 Fix href in docs w.r.t. cgroups freezer pointer
Apparently, the [...] and (http...) need to be right after each other instead
of on different lines.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b8ab535076
Component: cli
2017-06-02 00:06:36 +00:00
Doug Davis
7f52110b02 Fix typo: reguardless should be regardless
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6ad404ac57
Component: cli
2017-06-02 00:06:36 +00:00
Doug Davis
fd6cf0bbdc Add some docs about which env vars are defined in new containers
@SvenDowideit FYI

Closes #3087

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3be32c5e8e
Component: cli
2017-06-02 00:06:36 +00:00
Dan Walsh
183d9b651f Fix security-opt docs
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 53ee6d2237
Component: cli
2017-06-02 00:06:36 +00:00
James Turnbull
bb5e93ffdb Multiple fixes to the cli.md document.
*. Fixed headings so the side menu will now be consistent. Some sections
had H3s that were displaying and others did not leaving the left menu
very mismatched.

* Fixed several spelling errors.

* Re-formatted several long lines and badly laid out paragraphs.

* Fixed several double backticks.

* Added backticks to several outputs and variables.

* Removed two issues that are no longer valid.

* Removed several double spaces and extra lines.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a62d8740bf
Component: cli
2017-06-02 00:06:36 +00:00
Adrien Folie
dc688c1670 Add ENV variables support to WORKDIR build command
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)

Conflicts:
	builder/builder.go
		This file has been deleted.
Upstream-commit: 410719e6df
Component: cli
2017-06-02 00:06:36 +00:00
Doug Davis
7f828fa717 Add note to docs about lack of shell processing in JSON form
Closes #5509

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 49323dfac9
Component: cli
2017-06-02 00:06:36 +00:00
Tianon Gravi
9bfc7548cb Optimize the bash completion even further
The biggest/bestest change here is cutting down on the number of calls to Docker in the filtering helpers (`__docker_containers_running`, etc), especially calls to the really heavy `docker images`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: f071599471
Component: cli
2017-06-02 00:06:36 +00:00
Michael Scharf
8147491203 add bash completion support for pause and unpause
Signed-off-by: Michael Scharf <github@scharf.gr>
Upstream-commit: e775b26a78
Component: cli
2017-06-02 00:06:36 +00:00
Victor Vieux
73c5d2d2df update docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c5f3535b06
Component: cli
2017-06-02 00:06:35 +00:00
Dan Walsh
7038ac21eb Add --security-opts options to allow user to customize security configuration
security-opts will allow you to customise the security subsystem.

For example the labeling system like SELinux will run on a container.

    --security-opt="label:user:USER"   : Set the label user for the container
    --security-opt="label:role:ROLE"   : Set the label role for the container
    --security-opt="label:type:TYPE"   : Set the label type for the container
    --security-opt="label:level:LEVEL" : Set the label level for the container
    --security-opt="label:disabled"    : Turn off label confinement for the container

Since we are passing a list of string options instead of a space separated
string of options, I will change function calls to use InitLabels instead of
GenLabels.  Genlabels interface is Depracated.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 5619082f2b
Component: cli
2017-06-02 00:06:35 +00:00
Vishnu Kannan
41c0fbd731 Adding exec remote API documentation along with minor code cleanup.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 6f116d084a
Component: cli
2017-06-02 00:06:35 +00:00
Jessica Frazelle
842f6d1e97 Filter containers by status.
A continuation of #7616.
Adds `docker ps --filter=status=(restarting|running|paused|stopped)` option.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 5419043a5d
Component: cli
2017-06-02 00:06:35 +00:00
Daniel Farrell
08787f1ac5 Doc update to clarify EXPOSE vs -p functionality.
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Upstream-commit: 1d2bb271ac
Component: cli
2017-06-02 00:06:35 +00:00
Doug Davis
28be9d5897 Add more info about when build cache is invalidated/used - Issue #3636
Plus some edits as suggested by @jamtur01

Closes #3636

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0e82ab713b
Component: cli
2017-06-02 00:06:35 +00:00
SvenDowideit
7c55acb65b Add the 2 image events found using git grep 'Job("log"'
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: ed49f5cab1
Component: cli
2017-06-02 00:06:35 +00:00
SvenDowideit
f95548a29c The list of events that 'grep' told me about
docker(master) $ git grep 'LogEvent("' | sed 's/.*("//' | sed 's/").*//'
| sort | uniq | paste -s -d","
create,destroy,die,export,kill,pause,restart,start,stop,unpause

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 003ddf6100
Component: cli
2017-06-02 00:06:35 +00:00
Doug Davis
da4bfdb14a add wildcard support to copy/add
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1a83c9f87e
Component: cli
2017-06-02 00:06:35 +00:00