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
Tibor Vass
8b18a2da54
Merge pull request #8051 from jfrazelle/image-tag-can-be-one-letter-test-update
...
Update integration-cli tests to allow one-letter tag as valid
2014-09-15 18:25:59 -04:00
Jessica Frazelle
985fae256f
Update integration-cli tests to allow one-letter tag as valid.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-15 15:17:50 -07:00
Jessie Frazelle
09982d0f97
Merge pull request #8049 from unclejack/fix_tag_validation
...
graph: validate tags properly & add unit tests
2014-09-15 14:32:02 -07:00
unclejack
ada883b198
graph: validate tags properly & add unit tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-16 00:13:54 +03: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
Fred Lifton
fd501d4b3a
Merge pull request #8044 from brahmaroutu/container_copy_6107
...
Change the copy command Content-Type header to x-tar
2014-09-15 12:06:48 -07:00
Alexandr Morozov
fbae71326c
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
2014-09-15 23:03:30 +04: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
Alexandr Morozov
88a786d3c4
Merge pull request #8038 from unclejack/failed_build_context_cleanup
...
clean up the context when a build fails
2014-09-15 17:50:50 +04:00
unclejack
31c0039022
clean up the context when a build fails
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-15 16:01:23 +03:00
unclejack
a10a86d437
Merge pull request #7698 from tamsky/tune2fs_base_filesystem
...
use tune2fs to disable ext4 mount counts and mount intervals
2014-09-15 15:42:52 +03: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
unclejack
c751e1739d
Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999
...
Fix ps -s hang
2014-09-15 13:54:29 +03: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
Erik Kristensen
c4db3b8075
HTTP Status 201 not 200
...
The http status should be 201 not 200.
Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com> (github: SvenDowideit)
2014-09-15 10:58:45 +10:00
Sven Dowideit
0c5a7ad577
Merge pull request #8008 from dwgebler/master
...
fixes incorrect environment variable labeling in container linking guide
2014-09-15 10:51:38 +10:00
Nicholas E. Rabenau
81357e12e7
Append instead of replace file contents
...
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
2014-09-13 22:26:40 +02:00
Erik Hollensbe
09b700288e
Allow /etc/hosts and /etc/resolv.conf to be updated both outside and
...
inside the container.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-13 11:27:34 -07:00
Tibor Vass
23f490427f
Merge pull request #7983 from vbatts/vbatts-tarsum_switch_names
...
tarsum: TarSum should be the interface
2014-09-12 17:01:35 -04:00
unclejack
da4dba2e8c
Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash
...
Ensure container names start with a-zA-Z0-9
2014-09-12 23:15:16 +03:00
Michael Crosby
63a1548688
Merge pull request #8004 from duglin/Issue6447
...
Fix parsing of proto/port - issue 6447
2014-09-12 12:00:57 -07:00
Doug Davis
658a9d0f47
Fix parsing of proto/port
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-12 11:39:14 -07:00
Michael Crosby
a96811272a
Merge pull request #7934 from LK4D4/fix_double_allocation
...
Fix error propagation from userland-proxy
2014-09-12 11:39:10 -07:00
Jessica Frazelle
aa2af817be
Ensure container names start with a-zA-Z0-9
...
Closes #8012 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-12 10:45:07 -07:00
Fred Lifton
64ecef59af
Merge pull request #7986 from abh1nav/master
...
Update remote_api_client_libraries.md
2014-09-12 10:37:00 -07:00
Fred Lifton
1501adad29
Merge pull request #7987 from SvenDowideit/stop-hurting-blackrosezys-eyes
...
Yep, its been hurting my eyes too - and you've finally inspired me to fi...
2014-09-12 10:35:30 -07:00
James Turnbull
127f72d3ba
Merge pull request #8011 from fsouza/fix-typo-remote-api
...
docs/reference/api: fix typo in docs
2014-09-12 13:26:24 -04:00
Francisco Souza
fe5b72e7bb
docs/reference/api: fix typo in docs
...
Signed-off-by: Francisco Souza <f@souza.cc>
2014-09-12 13:57:43 -03:00
Alexandr Morozov
a612d85916
Merge pull request #8009 from unclejack/better_run_test_debug
...
integ-cli: better debug output for run & import
2014-09-12 18:38:46 +04:00
unclejack
3ec564bfda
integ-cli: better debug output for run & import
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-12 16:51:21 +03:00
James Turnbull
b6b85a58fd
Merge pull request #7998 from duglin/Issue5701
...
Add notes about single-quotes (for issue 5701)
2014-09-12 07:41:31 -04:00
David Gebler
78fe117076
Signed-off-by: David Gebler <davidgebler@gmail.com>
...
modified: userguide/dockerlinks.md
fixes incorrect environment variable labeling in container linking guide
2014-09-12 11:04:40 +01:00
Alexandr Morozov
41cbce8c00
Test for docker ps -s
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-12 11:45:50 +04:00
Alexandr Morozov
82bdd88e9c
Use unlocked version of changes for GetImage
...
Fixes #7999
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-12 11:44:51 +04:00
Alexandr Morozov
555ce0cb54
Use defined variable
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-12 11:42:12 +04:00
Alexandr Morozov
41e9e93e27
Fix my own comments from #7927
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-12 10:05:07 +04:00
Erik Hollensbe
3b6a29b81a
Fix an issue where already allocated ports would not trigger an error.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-12 09:51:14 +04:00
Tibor Vass
3109fc9537
Add Test for port allocation bug (port already in use by other programs than docker)
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-12 09:51:14 +04:00
Sven Dowideit
0517099a91
Document how to pass ENV vars to the user's shell
...
As this is a somewhat common question.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-12 13:34:01 +10:00
Sven Dowideit
df8dbfa45d
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)
2014-09-12 11:10:07 +10:00
Michael Crosby
32b5d145fa
Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag
...
Failing to remove an image, will not remove the image name/tag.
2014-09-11 18:06:18 -07:00
Sven Dowideit
990da301cf
Merge pull request #7988 from markotibold/patch-1
...
Fixed a typo
2014-09-12 10:41:12 +10:00
Sven Dowideit
c0783dfceb
Merge pull request #7991 from laktek/master
...
Fixed a typo in docs (outpu -> output).
2014-09-12 10:40:16 +10:00
Sven Dowideit
6941931daa
Merge pull request #8000 from estesp/7985-networkport-doc-changes
...
Match docs to actual port range used in code.
2014-09-12 10:18:03 +10:00
Michael Crosby
d9c7c1a7da
Merge pull request #7957 from bfirsh/consistent-help-messages
...
Consistent help messages
2014-09-11 15:25:28 -07:00
Michael Crosby
98e409172c
Merge pull request #7996 from estesp/7943-validate-tagnames
...
Validate tag names similar to repository name validation; add tests
2014-09-11 15:19:50 -07:00