0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10663 commits 14 branches 412 tags 338 MiB
Commit graph

2310 commits

Author SHA1 Message Date
unclejack
9fb34ae571 Merge pull request #6101 from LK4D4/ip_range_#4986 
Implement allocating IPs from CIDR within bridge network
 2014-09-22 17:09:16 +03:00
Sven Dowideit
27226d47c1 Merge pull request #8124 from jyrkiput/patch-1 
Fix detaching from attached container
 2014-09-22 09:28:10 +10:00
Andrey Petrov
c5805c8772 Cleanup: Fix cli docs: Sorted command headers. 
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net>
 2014-09-20 18:10:11 -07:00
Jyrki Puttonen
1d2a1598c5 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>
 2014-09-19 19:34:05 +03:00
Erik Hollensbe
e91de29e08 Merge pull request #8076 from duglin/MultiCopyAdd 
Add support for copy/add with multiple src files
 2014-09-19 09:01:29 -07:00
Sven Dowideit
39ed048aab Merge pull request #8091 from jfrazelle/exec-main-manpage 
Add docker-exec to main manpage
 2014-09-19 16:17:11 +10:00
James Turnbull
742eb7e001 Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit 
boot2docker shellinit will set any and all env vars needed.
 2014-09-19 00:46:15 -04:00
Doug Davis
05b8a1eb36 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>
 2014-09-18 20:12:13 -07:00
Michael Crosby
72e9015591 Merge pull request #7694 from eyakubovich/master 
Add an option to disable IP masquerading
 2014-09-18 18:33:45 -07:00
Sven Dowideit
82aa895c6d Merge pull request #8061 from SvenDowideit/document-image-tarball-format 
Add a little description of the image tarball format.
 2014-09-19 10:32:13 +10:00
Sven Dowideit
7797572249 boot2docker shellinit will set any and all env vars needed. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-19 10:20:12 +10:00
Albert Callarisa
4e11902d05 'an file' -> 'a file' grammar fix 
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
 2014-09-19 08:12:33 +08:00
Frederick F. Kautz IV
3bb12d390a 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>
 2014-09-18 08:48:24 +04:00
Sven Dowideit
db9f8ba55c Add a little description of the image tarball format. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-18 10:40:55 +10:00
Sven Dowideit
e9b5acba4b Merge pull request #8081 from abh1nav/master 
Update remote_api_client_libraries.md
 2014-09-18 10:24:53 +10:00
Sven Dowideit
c7c78acf81 Merge pull request #8025 from davidpelaez-forks/docs-fix 
Improved X-Registry-Auth content instructions
 2014-09-18 09:54:25 +10:00
Jessica Frazelle
fc75ade4f8 Add docker-exec to main manpage 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-17 11:46:49 -07:00
Abhinav Ajgaonkar
ad65930d0b Update remote_api_client_libraries.md 
Ordering all clients alphabetically, by language.
Including all available languages in `page_keywords`.

Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com>
 2014-09-17 03:42:57 -04:00
Fred Lifton
b03f506303 Merge pull request #8073 from ClusterHQ/7743-restart-policy-api-doc 
Add some documentation for the RestartPolicy feature.
 2014-09-16 20:06:55 -07:00
Eugene Yakubovich
4dc4d56db9 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>
 2014-09-16 20:00:15 -07:00
David Pelaez
8c2b170c6e Improved X-Registry-Auth content instructions 
Hi,

this is a small contribution to fix some slightly unprecise information about the `X-Registry-Auth` header required to pull from private registries through the remote API. After a lot of trial and I error I managed to find that the documentation indications had this issues:

* Apparently single quotes cannot be used and double quotes (regular JSON) is required.
* Also the `auth` key must be passed even if empty or a 403 will result.
* It was not clear what the `serveraddress` had to be.

I added some small clarifications for anyone taking a look at the docs to keep them from the problems I've encountered. Hope this is helpful.

Thanks to all the contributors for bringing so much awesomeness to the linux world. :)

Signed-off-by: David Pelaez Tamayo <hello@davidpelaez.me>
 2014-09-16 19:20:47 -05:00
Jessie Frazelle
f98a1f1f7d Merge pull request #8019 from thockin/add-host 
Allow extra lines in /etc/hosts
 2014-09-16 17:19:16 -07:00
Tim Hockin
68e48b65a6 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>
 2014-09-16 23:38:23 +00:00
SvenDowideit
22eb3a3a50 add 'docker create' man page 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-09-16 18:40:25 -04:00
Tibor Vass
7c85cf5f39 docs fix 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-16 18:40:24 -04:00
Alexander Larsson
3a90004f3c 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)
 2014-09-16 18:40:24 -04:00
Jean-Paul Calderone
d758da386a Add some documentation for the RestartPolicy feature. 
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com>
 2014-09-16 17:40:56 -04:00
Jessie Frazelle
51b26853ef Merge pull request #7976 from duglin/Issue7902 
Fix for issue 7902 - add trailing zeros to timestamps so logs align
 2014-09-16 13:55:03 -07:00
Alexandr Morozov
00fd008170 Merge pull request #8062 from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
 2014-09-16 23:56:12 +04:00
Vishnu Kannan
c786a8ee5e 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)
 2014-09-16 19:24:25 +00:00
Doug Davis
cd7a5f5c09 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>
 2014-09-16 10:28:37 -07:00
James Turnbull
b645589071 Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere 
Consistently use 'sudo docker' in examples
 2014-09-16 08:43:58 -04:00
James Turnbull
b040ba99d0 Merge pull request #8060 from SvenDowideit/missing-t-in-get-api-eg 
Added missing 't' from the end of the /images/{{id}}/get eg.
 2014-09-16 08:43:26 -04:00
Sven Dowideit
4352ea7b0a Added missing 't' from the end of the /images/{{id}}/get eg. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-16 15:27:44 +10:00
Sven Dowideit
fc9a3b1c1b Consistently use 'sudo docker' in examples 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-16 11:49:05 +10:00
Fred Lifton
023241614e Merge pull request #8034 from michaljemala/patch-1 
The default name of the bridge created is called 'docker0'.
 2014-09-15 17:32:57 -07:00
Sven Dowideit
a3f51da98a Help new users if their SELinux is not-upgraded yet. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-16 10:18:50 +10:00
Sven Dowideit
2f65ed0968 Merge pull request #8036 from unclejack/kernel_version_requirement 
docs: change kernel version requirement
 2014-09-16 10:14:02 +10:00
Sven Dowideit
62b86613e8 Merge pull request #8037 from unclejack/shrink_docs_images 
docs: shrink images
 2014-09-16 10:13:03 +10:00
Fred Lifton
4b0bb71627 Merge pull request #8023 from nerab/patch-1 
Append instead of replace file contents
 2014-09-15 13:54:41 -07:00
Fred Lifton
c892423209 Merge pull request #8005 from SvenDowideit/document-sshd-env-vars 
Document how to pass ENV vars to the user's shell
 2014-09-15 12:44:56 -07:00
Srini Brahmaroutu
788e4acaa3 Change the copy command Content-Type header to x-tar 
Addresses #6107

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-09-15 10:45:06 -07:00
Vishnu Kannan
0029180f7f 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)
 2014-09-15 17:06:07 +00:00
Vishnu Kannan
669561c2aa Address review comments. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 17:00:00 +00:00
Vishnu Kannan
e1818d2a69 Update cli.md to include 'docker exec' feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:05 +00:00
Vishnu Kannan
d130c10ab7 Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:05 +00:00
unclejack
0619512582 docs: change kernel version requirement 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-15 15:15:55 +03:00
unclejack
90dcc7c840 docs: shrink images 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-15 14:46:29 +03:00
Michal Jemala
140229677a The default name of the bridge created is called 'docker0'. 2014-09-15 12:10:46 +01:00
Sven Dowideit
0658be89d0 Merge pull request #8028 from SvenDowideit/ekristen-patch-1 
HTTP Status 201 not 200
 2014-09-15 11:00:05 +10:00