docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
11,335 Commits 12 Branches 296 Tags
ff11c586b298be370663ad4c82341fc333121eb8
Commit Graph

267 Commits

Author SHA1 Message Date
Michael Crosby
3def82482e Expand documentation for --insecure-registries 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 48f7384d6365c59b4b61d527630aaf88af24f6dd
Component: engine
 2014-10-30 19:41:55 -04:00
unclejack
6b54bde512 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: 380c8320a78dc16da65d9d13004422ac5a0cca53
Component: engine
 2014-10-30 19:41:55 -04:00
Andrea Luzzardi
e6c9b85c85 Expose # of CPUs and memory available on docker info. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
 2014-10-24 15:56:37 -07:00
Sven Dowideit
a67bf902c4 Link to run reference from cli doc 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 9e137ceb578bd427124d4937bc6e440ae5267bf6
Component: engine
 2014-10-21 11:21:11 +10:00
James Turnbull
beee7faafb Merge pull request #8614 from ryanrdetzel/master 
exec docs syntax fix
Upstream-commit: 04932e38afa78441e60ba6b86021a61a70e4692c
Component: engine
 2014-10-17 14:38:43 -04:00
Michael Crosby
fcf584741e Merge pull request #8465 from SvenDowideit/document-device-flag-permission-options 
Add info on --device flag permissions ':rwm'
Upstream-commit: 4b594721c409318040d691d2dc1a58dbbab888b5
Component: engine
 2014-10-16 14:00:09 -07:00
Ryan Detzel
43742710a1 Docs syntax fix 
the flags must come before the container name.
Upstream-commit: b8b9930a8ab95cfe32731e014a57690f154d01fa
Component: engine
 2014-10-16 15:57:38 -04:00
SvenDowideit
65957340a9 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: 5bcff59febc1ac798d735b52cc4e92db1ab41bd9
Component: engine
 2014-10-14 12:05:09 +10:00
Fred Lifton
33f3f70f42 Merge pull request #8503 from aanand/tlsverify-environment-variable 
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
Upstream-commit: ce669297df2981214c5d01e54c358347c5852ef7
Component: engine
 2014-10-13 10:20:10 -07:00
James Turnbull
b5c4deb0f6 Merge pull request #8435 from SvenDowideit/explain-docker-attach-more 
Add more info on attach inspired by discussion in #2855
Upstream-commit: 42b217044a0a00af3ccf4e801e162014f67d941a
Component: engine
 2014-10-13 13:19:22 -04:00
James Turnbull
87e05c54cf Merge pull request #8523 from duglin/FixLinkCmdLine 
Fix href in docs w.r.t. cgroups freezer pointer
Upstream-commit: e3101a3508a67fd7653ad95052845513facb6569
Component: engine
 2014-10-13 13:18:49 -04:00
Aanand Prasad
830a3741c6 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: 19fb942d3609f647adeda68c6ca106371c7b32ac
Component: engine
 2014-10-13 11:49:26 +01:00
Sven Dowideit
a91e1dbdcd 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: 2709c4677c252a07d49a24f7583adcc17b38fa14
Component: engine
 2014-10-13 17:41:12 +10:00
Sven Dowideit
608d55c5e6 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: 801edfa9b8a765e734ac4a909ab032f0cb03fe87
Component: engine
 2014-10-13 17:30:08 +10:00
Doug Davis
011a4fae94 Fix typo: reguardless should be regardless 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ba7038c8d2a86e34bba2128b5b973864eb41c7a6
Component: engine
 2014-10-12 14:41:24 -07:00
Doug Davis
6430118dac 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: b10e11f30e111e6d4ae4b439e64463e08b3ab78b
Component: engine
 2014-10-12 12:59:46 -07:00
James Turnbull
d02e9b822c 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: ee101c3b2c9efdd0f11e4e96659db18ada3734c8
Component: engine
 2014-10-03 16:28:43 -04:00
Vishnu Kannan
1dd6380138 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: 021ecb1d1355e8291a5a872c761a1e367072e308
Component: engine
 2014-09-30 18:26:58 +00:00
Jessica Frazelle
ce150ab801 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: ea09f036824aee74112a75ac99579ae4f10251b5
Component: engine
 2014-09-29 20:11:19 -07:00
SvenDowideit
c5b4eb76ec 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: 71e28f9d645ce3e216f87ad0a56c2800ec98155d
Component: engine
 2014-09-26 11:55:36 +10:00
SvenDowideit
d8fc51798c 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: 05060a7c9496056fb792330027b7a73aec192697
Component: engine
 2014-09-26 11:25:36 +10:00
Sven Dowideit
38bdca26a3 Merge pull request #8209 from brahmaroutu/doc_dockerignore_7724 
Adding details on how to use .dockerignore file
Upstream-commit: 6df533adb45c50757311e2a6fa11e6344c194ab0
Component: engine
 2014-09-26 10:53:36 +10:00
Srini Brahmaroutu
ac88033623 Adding details on how to use .dockerignore file 
Addresses #7724

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: d7725ececab8f948356342a032be2f6b370560f5
Component: engine
 2014-09-25 12:48:17 -07:00
Tibor Vass
001f52b09b Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id 
Pull all image aliases for id
Upstream-commit: 1379c6ec504f348454796b0ac1d46025c183bb4e
Component: engine
 2014-09-25 15:22:46 -04:00
Jessica Frazelle
4092cbb7ff Pull all image aliases for id. Closes #8141. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7d74be162c9704df848c865a9b4bcd4047da9124
Component: engine
 2014-09-25 11:48:49 -07:00
SvenDowideit
46317f724f Updated output from the docker cli help 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: cb6b196ab470dad0ced37e20f525758625e488cb
Component: engine
 2014-09-25 16:07:55 +10:00
Tibor Vass
fce5f6490a Merge pull request #8195 from tiborvass/migrate-get.docker.io 
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Upstream-commit: 3fa0ed01425dc6facb85a00338ddf99ed74a86be
Component: engine
 2014-09-24 19:06:09 -04:00
Tibor Vass
8a28fc553b Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
 2014-09-24 18:53:27 -04:00
Sven Dowideit
4116d85932 That URL isn't there anymore 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 46319a5c33c324b26bc4c8ad647632744ef88cbc
Component: engine
 2014-09-23 15:04:00 +10:00
unclejack
eb02e608df Merge pull request #6101 from LK4D4/ip_range_#4986 
Implement allocating IPs from CIDR within bridge network 
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
 2014-09-22 17:09:16 +03:00
Sven Dowideit
3ebe7ce35b Merge pull request #8124 from jyrkiput/patch-1 
Fix detaching from attached container
Upstream-commit: 27226d47c17588c867f2c533b87977955f2ca66e
Component: engine
 2014-09-22 09:28:10 +10:00
Andrey Petrov
c2a971c0cd Cleanup: Fix cli docs: Sorted command headers. 
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net>
Upstream-commit: c5805c8772b2439ce9d8c7022bd8c8208648bc5b
Component: engine
 2014-09-20 18:10:11 -07:00
Jyrki Puttonen
bec783657b 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: 1d2a1598c54d9ca8d3d02ec5e7b0231a8cf153d3
Component: engine
 2014-09-19 19:34:05 +03:00
Michael Crosby
5503a73c31 Merge pull request #7694 from eyakubovich/master 
Add an option to disable IP masquerading
Upstream-commit: 72e901559177a4a49f82779dbaa108487dce086d
Component: engine
 2014-09-18 18:33:45 -07:00
Albert Callarisa
b339cb93d3 'an file' -> 'a file' grammar fix 
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
Upstream-commit: 4e11902d05816ba76e15f4af91dd4c507946072e
Component: engine
 2014-09-19 08:12:33 +08:00
Frederick F. Kautz IV
2508e0d078 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: 3bb12d390a8a965e4dc680db7ecdab8c76f23990
Component: engine
 2014-09-18 08:48:24 +04:00
Eugene Yakubovich
9ba82afe29 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: 4dc4d56db9797159e2e329845e0b94e3e0f780a0
Component: engine
 2014-09-16 20:00:15 -07:00
Jessie Frazelle
118f175983 Merge pull request #8019 from thockin/add-host 
Allow extra lines in /etc/hosts
Upstream-commit: f98a1f1f7d9b3ef10c13fc3b6438c978b4d6aa78
Component: engine
 2014-09-16 17:19:16 -07:00
Tim Hockin
604739ede9 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: 68e48b65a64df10fc797cbaa89d6caa2188eadc9
Component: engine
 2014-09-16 23:38:23 +00:00
Tibor Vass
f321bfe40f docs fix 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 7c85cf5f390a8fe5088d2e275abfd2404aa19048
Component: engine
 2014-09-16 18:40:24 -04:00
Alexander Larsson
764b128304 Add "docker create" support 
This exposes the already existing "create container" operation.  It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)

Conflicts:
	api/client/commands.go
	runconfig/parse.go
	server/container.go

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 3a90004f3c2d86ec849f4674c8046693ea061ed1
Component: engine
 2014-09-16 18:40:24 -04:00
Jessie Frazelle
bcad074599 Merge pull request #7976 from duglin/Issue7902 
Fix for issue 7902 - add trailing zeros to timestamps so logs align
Upstream-commit: 51b26853ef2f124ea837364c02585cbf96999d6a
Component: engine
 2014-09-16 13:55:03 -07:00
Alexandr Morozov
d25c9ab27a Merge pull request #8062 from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
Upstream-commit: 00fd008170e463426001ec4c56fc4c39450fd8d0
Component: engine
 2014-09-16 23:56:12 +04:00
Vishnu Kannan
8b57e6f159 Adding docker exec support in CLI. 
Fixed a bug in daemon that resulted in accessing of a closed pipe.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c786a8ee5e9db8f5f609cf8721bd1e1513fb0043
Component: engine
 2014-09-16 19:24:25 +00:00
Doug Davis
a36831cc2a Fix for issue 7902. 
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cd7a5f5c0998f288f71d307076e661ed54f1a5f1
Component: engine
 2014-09-16 10:28:37 -07:00
Sven Dowideit
cd4d60a084 Consistently use 'sudo docker' in examples 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
 2014-09-16 11:49:05 +10:00
Vishnu Kannan
f0e80c1ea0 Removing 'exec' feature from the CLI until the docker daemon supports resizing of 
tty sessions for exec'ed commands.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 0029180f7feb59fd0e4fede0bb839e2aa4968811
Component: engine
 2014-09-15 17:06:07 +00:00
Vishnu Kannan
40a1e3c634 Address review comments. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 669561c2aa8966f9327eca4304a06168bcf5bc49
Component: engine
 2014-09-15 17:00:00 +00:00
Vishnu Kannan
35e155ffb1 Update cli.md to include 'docker exec' feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: e1818d2a69e691acc9fa8d05ee87c07b2e474a0c
Component: engine
 2014-09-15 16:59:05 +00:00
Sven Dowideit
f8e23ee9a1 Override prettyPrint's colour choice (red) for strings in quotes. 
I've moved the docs.css to last so it can tweak any existing css, and
then set that to the same grey colour used for 'normal' text.

While testing I found and fixed an over-zealous line wrap.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: df8dbfa45dee108c6bb002f49a5f36e7d911616d
Component: engine
 2014-09-12 11:10:07 +10:00