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
2017-06-02 00:06:37 +00:00
0243ab522c
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 588d30ecca
2017-06-02 00:06:37 +00:00
ab2803a8e5
builder: Update documentation WRT environment replacement
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 15192a0bc1
2017-06-02 00:06:37 +00:00
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
2017-06-02 00:06:37 +00:00
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
2017-06-02 00:06:37 +00:00
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
2017-06-02 00:06:37 +00:00
26175343ba
Docs syntax fix
...
the flags must come before the container name.
Upstream-commit: ff38494bbe
2017-06-02 00:06:37 +00:00
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
2017-06-02 00:06:37 +00:00
5d203350cb
Rewrite documentation for insecure registries
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/reference/commandline/cli.md
Upstream-commit: d227c88e19
2017-06-02 00:06:37 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
fe3d69425b
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: c773557121
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
7f52110b02
Fix typo: reguardless should be regardless
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6ad404ac57
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
183d9b651f
Fix security-opt docs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 53ee6d2237
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
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
2017-06-02 00:06:36 +00:00
73c5d2d2df
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c5f3535b06
2017-06-02 00:06:35 +00:00
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
2017-06-02 00:06:35 +00:00
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
2017-06-02 00:06:35 +00:00
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
2017-06-02 00:06:35 +00:00
08787f1ac5
Doc update to clarify EXPOSE vs -p functionality.
...
Signed-off-by: Daniel Farrell <dfarrell@redhat.com >
Upstream-commit: 1d2bb271ac
2017-06-02 00:06:35 +00:00
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
2017-06-02 00:06:35 +00:00
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
2017-06-02 00:06:35 +00:00
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
2017-06-02 00:06:35 +00:00
da4bfdb14a
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1a83c9f87e
2017-06-02 00:06:35 +00:00
dc7a961ff2
Adding details on how to use .dockerignore file
...
Addresses #7724
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 62cc00b765
2017-06-02 00:06:35 +00:00
6df89ee708
Pull all image aliases for id. Closes #8141 .
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 3e3d368b74
2017-06-02 00:06:35 +00:00
20728b1521
Updated output from the docker cli help
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5c9bb30d90
2017-06-02 00:06:35 +00:00
ce71b7d929
builder: Fix handling of VOLUME command where multiple volumes are
...
specified in a space delimited list.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 82ff6f0c9f
2017-06-02 00:06:35 +00:00
97a4071f4e
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: b6e3153734
2017-06-02 00:06:35 +00:00
dcdc597a18
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 85808d776d
2017-06-02 00:06:35 +00:00
f3ef53c1fa
That URL isn't there anymore
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 056efbbe14
2017-06-02 00:06:35 +00:00
e34558a69d
Doc update to clarify random port mapping on docker run -P
...
Signed-off-by: Dan Cotora <d@bluevision.ro >
Upstream-commit: d6d5dcd55a
2017-06-02 00:06:35 +00:00
83f8fd461d
Adding additional documentation for fixed-cidr networking
...
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu > (github: fkautz)
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: e938ac9e78
2017-06-02 00:06:35 +00:00
8116c5ab68
Implement allocating IPs from CIDR within bridge network
...
Fixes #4986
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 1798f72254
2017-06-02 00:06:34 +00:00
8abff83092
Fix detaching from attached container
...
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md
Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com >
Upstream-commit: 5afc964a9e
2017-06-02 00:06:34 +00:00
8c8167747e
Cleanup: Fix cli docs: Sorted command headers.
...
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net >
Upstream-commit: 9c74cf01e2
2017-06-02 00:06:34 +00:00
17eed5a7b8
Add support for copy/add with multiple src files
...
Part one of solution for issue #6820
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6ea2cc5e0e
2017-06-02 00:06:34 +00:00
ff2b882022
Add an option to disable IP masquerading
...
For the cases where --bip option is used it is sometimes best to disable
IP masquerading as the provided bridge IP range may be routable.
Signed-off-by: Eugene Yakubovich <eugene.yakubovich@coreos.com >
Upstream-commit: a492b97cd0
2017-06-02 00:06:34 +00:00
409eb6c388
'an file' -> 'a file' grammar fix
...
Signed-off-by: Albert Callarisa Roca <albert@acroca.com >
Upstream-commit: 54f5e16a38
2017-06-02 00:06:34 +00:00
279a61f613
Allow extra lines in /etc/hosts
...
This adds a --add-host host:ip flag which appends lines to /etc/hosts. This is needed in places where you want the container to get a different name resolution than it would through DNS. This was submitted before as #5525 , closed, and now I am re-opening. It has come up 2 or 3 times in the last couple days.
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 14c0f0781d
2017-06-02 00:06:34 +00:00
a9323afb14
docs fix
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 7786198ec8
2017-06-02 00:06:34 +00:00
