docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
12,895 Commits 12 Branches 295 Tags
1ca090efba9705e4fa2f204fc5501c73fe4ef920
Commit Graph

2626 Commits

Author SHA1 Message Date
Fred Lifton
569feae573 Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs 
DHE documentation placeholder and Navbar changes
Upstream-commit: c12fb48a8a7df71ec3b952800ead1f21aea9ada6
Component: engine
 2015-01-29 10:23:57 -08:00
Fred Lifton
7d86677c51 Merge pull request #10293 from SvenDowideit/test-9952 
comment out the docker and curl lines we'll run later
Upstream-commit: 5b9b5aff06aa0e2c8397ee4cfb62e7f1ea249e0e
Component: engine
 2015-01-29 10:18:53 -08:00
Fred Lifton
dad1ed7610 Merge pull request #10428 from mehulkar/patch-1 
Improve explanation of port mapping from containers
Upstream-commit: 9e10a888a3d4c804eb4a2aebcf0467b8ae0e4076
Component: engine
 2015-01-29 10:07:24 -08:00
Mehul Kar
b5b158f395 Improve explanation of port mapping from containers 
Signed-off-by: Mehul Kar <mehul.kar@gmail.com>
Upstream-commit: f1bc02e91f79b4a54f47e0ad4abfd3d48b698ec4
Component: engine
 2015-01-29 09:09:44 -08:00
James Turnbull
69b545f6ad Merge pull request #10351 from duglin/FixDocsWorkdir 
Fix docs so WORKDIR mentions it works for COPY and ADD too
Upstream-commit: ba8e1673ad81f97d836acfdacbed5f4c54a0ef68
Component: engine
 2015-01-29 09:52:01 -05:00
Sven Dowideit
00303c7fa9 DHE documentation placeholder and Navbar changes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0ce3a49d64bcfd81823fe0e9bf54c51ddf6e35d4
Component: engine
 2015-01-29 20:50:43 +10:00
Sebastiaan van Stijn
65b792b36b Replace "base" with "ubuntu" in documentation 
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.

This changes the API documentation to use "ubuntu" in stead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c0969ed3d896c9add0a2cca7b9a9074cd138571b
Component: engine
 2015-01-28 22:54:10 +01:00
James Turnbull
15ba70ac25 Merge pull request #10408 from estesp/fix-ipv6-docs 
Fix incorrect IPv6 addresses/subnet notations in docs
Upstream-commit: 8d49ebd3381af51370df346b797515b4a32ac153
Component: engine
 2015-01-27 23:24:52 -05:00
Phil Estes
937fb930a0 Fix incorrect IPv6 addresses/subnet notations in docs 
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 5945de43b02406dbc0eee44954eb21e5926bde00
Component: engine
 2015-01-27 22:45:43 -05:00
Sven Dowideit
b15db42113 Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks 
tell users they can what IP range Hub webhooks can come from so they can...
Upstream-commit: de52a1998dbec1b5a7f9e27bcf527971b8df3666
Component: engine
 2015-01-28 11:55:09 +10:00
Sven Dowideit
6813c73a03 Add the registry mirror document to the menu 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1d04cc513a958009131ca54bd6904be14fef774e
Component: engine
 2015-01-28 10:47:11 +10:00
James Turnbull
adf36f2445 Merge pull request #10369 from mcfiredrill/etc-host-typo 
fix /etc/host typo in remote API docs
Upstream-commit: 3ac5596fe05a910a91f021de10b2c6cd16eacb07
Component: engine
 2015-01-27 18:35:16 -05:00
Michael Crosby
2e68f2825a Merge pull request #10113 from imreFitos/master 
docs: remove NAT rule when removing bridge
Upstream-commit: e04cc93a2c92638bb00af8bae8f5a165ed036bfa
Component: engine
 2015-01-27 11:22:53 -08:00
Sven Dowideit
f2a3416f81 tell users they can what IP range Hub webhooks can come from so they can filter 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 6774be62d647b2e2f258bc7b4158cb9e10a3ecf6
Component: engine
 2015-01-27 14:58:29 +10:00
Doug Davis
a4bc7ec4fb Fix docs so WORKDIR mentions it works for COPY and ADD too 
The docs around COPY/ADD already mentioned that it will do a relative
copy/add based on WORKDIR, so that part is already ok.  Just needed to
tweak the WORKDIR section since w/o mentioning COPY/ADD it can be misleading.

Noticed by @phemmer

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f709da192cda47c9aaaa212b03442d4f28afdb97
Component: engine
 2015-01-26 17:13:44 -08:00
Tony Miller
aa7720d90d fix /etc/host typo in remote API docs 
Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
Upstream-commit: 87d2adf070a44d3d62dfe7ca8c13e95e92f53b64
Component: engine
 2015-01-27 10:12:54 +09:00
Sven Dowideit
2bb1b521d1 Merge pull request #10272 from mcfiredrill/document-extrahosts-remote-api 
document the ExtraHosts parameter for /containers/create for the remote ...
Upstream-commit: f3fef3127742a2128990d6f824681695478833bc
Component: engine
 2015-01-27 10:25:00 +10:00
Tony Miller
513e38914d document the ExtraHosts parameter for /containers/create for the remote API 
I think this was added from version 1.15.

Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
Upstream-commit: 54c10fe81d1894f9683293601a53a0d87a0d7fbd
Component: engine
 2015-01-23 23:52:04 +09:00
James Turnbull
dfa9fbab62 Merge pull request #10292 from SvenDowideit/pr_out_update_using_supervisord_md 
Update using_supervisord.md
Upstream-commit: d3a6a53fa5d399ed0d728e48eed8ea38bca9dc2c
Component: engine
 2015-01-23 00:09:25 -05:00
Sven Dowideit
a15322433b Merge pull request #9952 from flowlo/doc-https 
doc: Improve article on HTTPS
Upstream-commit: 992beb2a962a38e7958c14f6188098fe1814c9aa
Component: engine
 2015-01-23 12:34:57 +10:00
Sven Dowideit
a76944151d comment out the docker and curl lines we'll run later 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: eaf1b88212bb10019cf1d7b1555a305c12001f06
Component: engine
 2015-01-23 12:31:39 +10:00
GennadySpb
422d703cc0 Update using_supervisord.md 
Fix factual error

change made by: GennadySpb <lipenkov@gmail.com>

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 99dc224d850a8838f42b9f41229b484197f75fa5
Component: engine
 2015-01-23 10:43:57 +10:00
Lorenz Leutgeb
3685fbd1c9 Fix inconsistent formatting 
Colon was bold, but regular at other occurences.

Blame cf27b310c4fc8d2c13ba181398a628d03e1e3c58

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: a51554988e615b317e95125f5612a28c3bff8e8a
Component: engine
 2015-01-22 21:46:01 +01:00
Lorenz Leutgeb
f5baf563e6 doc: Minor semantical/editorial fixes in HTTPS article 
"read-only" vs. "only readable by you"

Refer to:
https://github.com/docker/docker/pull/9952#discussion_r22690266

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 048b20e58a1b9d516dd6fb34676d765ebd5a8959
Component: engine
 2015-01-22 21:37:39 +01:00
Lorenz Leutgeb
1894376959 doc: Editorial changes as suggested by @fredlf 
Refer to:
 * https://github.com/docker/docker/pull/9952#discussion_r22686652
 * https://github.com/docker/docker/pull/9952#discussion_r22686804

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 6ca2875e580e16a309eb9c9486bb358bde3622ff
Component: engine
 2015-01-22 21:37:39 +01:00
Lorenz Leutgeb
a50020fe51 doc: Improve article on HTTPS 
* Adjust header to match _page_title
 * Add instructions on deletion of CSRs and setting permissions
 * Simplify some path expressions and commands
 * Consqeuently use ~ instead of ${HOME}
 * Precise formulation ('key' vs. 'public key')
 * Fix wrong indentation of output of `openssl req`
 * Use dash ('--') instead of minus ('-')

Remark on permissions:

It's not a problem to `chmod 0400` the private keys, because the
Docker daemon runs as root (can read the file anyway) and the Docker
client runs as user.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 02a793c6a133f46129d0fc83ce218d3a92f1e644
Component: engine
 2015-01-22 21:37:39 +01:00
Andrew C. Bodine
5c5aa72c84 Adds docs for /containers/(id)/attach/ws api endpoint 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Upstream-commit: 51060ee07aaf3ff10ac7187558bd665f4ddd3507
Component: engine
 2015-01-21 18:37:08 -08:00
Michael Crosby
32b5682b75 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
 2015-01-21 14:16:51 -08:00
Michael Crosby
f0170e8737 Update to docker stats documentation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: db9b1e3654464b0e7008fbad15d43fbbba87b1a4
Component: engine
 2015-01-21 11:44:23 -08:00
Michael Crosby
a77fb96f4c Add documentation for stats feature 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
 2015-01-20 20:21:47 -08:00
James Turnbull
1c8677b886 Merge pull request #10206 from jfrazelle/add-docs-memory-swap 
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
 2015-01-20 18:20:13 -05:00
Fred Lifton
304cd59f67 Merge pull request #10135 from coolljt0725/update_link_docs 
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
 2015-01-19 18:12:50 -08:00
Michael Crosby
f4d05bcf4d Merge pull request #10124 from duglin/Issue10034 
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
 2015-01-19 17:09:18 -08:00
Jessica Frazelle
3a60e835c5 Add docs for --memory-swap. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7bb4b56cf98662ef5f1deb64bdf8a120490bc258
Component: engine
 2015-01-19 16:17:58 -08:00
Sven Dowideit
6d7d2d6f8c Merge pull request #10170 from thaJeztah/docs-note-environment-vars 
Document that ENV vars are not automatically updated
Upstream-commit: 04d1b93fce4789ad186b4762d94629c11c79ffbe
Component: engine
 2015-01-20 10:04:25 +10:00
Sven Dowideit
9eb9d337ae Merge pull request #10175 from fossilet/patch-1 
Add usage of port mapping for Boot2docker.
Upstream-commit: e08858a80dfd1d947a7cba5031febb6868256195
Component: engine
 2015-01-20 10:03:32 +10:00
James Turnbull
bfeba0bea3 Merge pull request #10192 from icecrime/9951_client_proxy_doc 
Add documentation for HTTP proxies
Upstream-commit: 826e0beade7deecdae19322e93a417c6c4872822
Component: engine
 2015-01-19 18:55:25 -05:00
Tibor Vass
1a5071a250 Merge pull request #9826 from icecrime/8318_whitespace_add_copy 
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
 2015-01-19 18:37:53 -05:00
Arnaud Porterie
51e443fb29 Add documentation for HTTP proxies 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3a1dbef8232ee4f58cbaf3a2776c27a4d5b04bc4
Component: engine
 2015-01-19 11:23:31 -08:00
Doug Davis
5d2fe159f4 Docker run -e FOO should erase FOO if FOO isn't set in client env 
See #10141 for more info, but the main point of this is to make sure
that if you do "docker run -e FOO ..." that FOO from the current env
is passed into the container.  This means that if there's a value, its
set.  But it also means that if FOO isn't set then it should be unset in
the container too - even if it has to remove it from the env.  So,
   unset HOSTNAME
   docker run -e HOSTNAME busybox env
should _NOT_ show HOSTNAME in the list at all

Closes #10141

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9ab73260f8e4662e7321b257c636928892f023cf
Component: engine
 2015-01-19 08:00:32 -08:00
James Turnbull
a9b7d25bb0 Merge pull request #10138 from ShockwaveNN/patch-1 
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
 2015-01-19 10:53:15 -05:00
James Turnbull
681db1e57f Merge pull request #10167 from bgazzera/master 
There was a missing command to re-run the web container.
Upstream-commit: 6286c0711f2abc4a427ba4064b2a5f3d478c4034
Component: engine
 2015-01-19 10:50:08 -05:00
Liang-Chi Hsieh
b9a7e1b9ee Fix typo. 
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
 2015-01-19 18:02:23 +08:00
Yongzhi Pan
adb4e7d83e Add usage of port mapping for Boot2docker. 
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com>
Upstream-commit: 9dc2d0b8a35724946139f954f9575411b31695ea
Component: engine
 2015-01-19 16:44:13 +08:00
Lei Jitang
9f931ee8fa Update the docs for --link accept container id 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
 2015-01-19 09:57:44 +08:00
Sebastiaan van Stijn
86e0c72c59 Document that ENV vars are not automatically updated 
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.

This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables

To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.

I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3fb06dc104bb66c3ec7be8a95a33845310083999
Component: engine
 2015-01-19 00:23:57 +01:00
Bruno Gazzera
a3290112e7 There was a missing command to re-run the web container. 
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com>
Upstream-commit: 44cde56333fe891e087b8aa5ba914345bbdedbc0
Component: engine
 2015-01-18 12:17:49 -03:00
imre Fitos
c766335ad5 fix typo 'setup/set up' 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
Upstream-commit: 73baa673c72a49e9cccfde6e844c7dee2e478d8e
Component: engine
 2015-01-17 11:21:25 -05:00
Jessie Frazelle
611f8510fe Merge pull request #9941 from SvenDowideit/build-pull-option-docs 
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
 2015-01-16 13:49:56 -08:00
Jessie Frazelle
712286a324 Merge pull request #10125 from estesp/9960-add-backingfs-info 
Add backing filesystem info to `docker info` command where applicable
Upstream-commit: eaf3c6f1aca3d2e3bd58300781dd31eec93622b1
Component: engine
 2015-01-16 13:41:37 -08:00