35e640c370
integ-cli: better debug output for run & import
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 3ec564bfda57f068aac813f4b985385c1c7e4f23
Component: engine
2014-09-12 16:51:21 +03:00
92ab71ec69
Merge pull request #7998 from duglin/Issue5701
...
Add notes about single-quotes (for issue 5701)
Upstream-commit: b6b85a58fd0455f2655219706e6061a5847b21b7
Component: engine
2014-09-12 07:41:31 -04:00
23359870fc
Signed-off-by: David Gebler <davidgebler@gmail.com>
...
modified: userguide/dockerlinks.md
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 78fe117076289695ab03c90d266c47438ab8db7a
Component: engine
2014-09-12 11:04:40 +01:00
1a0325cec5
Test for docker ps -s
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 41cbce8c005c201169e13902d62112ced9902928
Component: engine
2014-09-12 11:45:50 +04:00
7af74b4383
Use unlocked version of changes for GetImage
...
Fixes #7999
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 82bdd88e9c9db40ee8072f7c4c2832dfb3f73823
Component: engine
2014-09-12 11:44:51 +04:00
8627c41d84
Use defined variable
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 555ce0cb54943dab39f16582fc1923467e42af14
Component: engine
2014-09-12 11:42:12 +04:00
06ff531f43
Fix my own comments from #7927
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 41e9e93e27ccd637d9490412622529bdc7d7b8ff
Component: engine
2014-09-12 10:05:07 +04:00
9e31fe0a00
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)
Upstream-commit: 3b6a29b81a5280187b3d03c91950cf93f7e263ec
Component: engine
2014-09-12 09:51:14 +04:00
d6bc3658af
Add Test for port allocation bug (port already in use by other programs than docker)
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 3109fc9537682a7b9ee566f3674484b1b2296707
Component: engine
2014-09-12 09:51:14 +04:00
ec6541bfd4
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)
Upstream-commit: 0517099a91a3ca073efb2131684bbf3ab565644a
Component: engine
2014-09-12 13:34:01 +10:00
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
2bf1cd4824
Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag
...
Failing to remove an image, will not remove the image name/tag.
Upstream-commit: 32b5d145faac9013f9f78adfe3bb2a171d818863
Component: engine
2014-09-11 18:06:18 -07:00
d739fdd226
Merge pull request #7988 from markotibold/patch-1
...
Fixed a typo
Upstream-commit: 990da301cf79a07206751b6407125eb4ccbe4d9d
Component: engine
2014-09-12 10:41:12 +10:00
5948eafc31
Merge pull request #7991 from laktek/master
...
Fixed a typo in docs (outpu -> output).
Upstream-commit: c0783dfcebfd78b5798a7ea104162bb38180c265
Component: engine
2014-09-12 10:40:16 +10:00
567a864e6a
Merge pull request #8000 from estesp/7985-networkport-doc-changes
...
Match docs to actual port range used in code.
Upstream-commit: 6941931daad9653109df20f014d2a4f3b2c8fa93
Component: engine
2014-09-12 10:18:03 +10:00
666bfb2887
Merge pull request #7957 from bfirsh/consistent-help-messages
...
Consistent help messages
Upstream-commit: d9c7c1a7dadf1835587f993b7fe2029bb07f1ce0
Component: engine
2014-09-11 15:25:28 -07:00
ab21dc210b
use correct apt-key for test.docker.io/ubuntu
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 440eb7fee88791d4f2f0866b04ff15253b6df8e9
Component: engine
2014-09-11 15:22:36 -07:00
d6e3f1dab9
Merge pull request #7996 from estesp/7943-validate-tagnames
...
Validate tag names similar to repository name validation; add tests
Upstream-commit: 98e409172cb5872e0b081244bf8802e4a422d735
Component: engine
2014-09-11 15:19:50 -07:00
9bdc95ea12
Merge pull request #7959 from crosbymichael/update-libcontainer-sep6
...
Update libcontainer to 84ad9386a0240acb7475429a835
Upstream-commit: 2d4e43b26b93bb3c0e797fbf8b254077d6d7ed40
Component: engine
2014-09-11 14:59:24 -07:00
31470054b1
Validate tag names similar to repository name validation; add tests
...
Addresses #7943
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 46eb4140c915e05a893080b34b42e25b6a75de7b
Component: engine
2014-09-11 17:52:36 -04:00
3be52d7f70
Match docs to actual port range used in code.
...
Addresses #7985
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: d6f4b2ebb40ac79c3ba21e7196bba3b83124cf16
Component: engine
2014-09-11 17:20:01 -04:00
ad8c137992
Removing an image that fails, also removes the image name/tag.
...
Fixes #7845 and #7801 , and a real pain point I had :)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: b2efdc538de47d37718b8972cd6703be32fc23c2
Component: engine
2014-09-11 11:29:25 -07:00
f59e13d587
Merge pull request #7202 from timbot/add-registry-mirror-flag
...
Add daemon flag to specify public registry mirrors
Upstream-commit: ed7fb3bbdaa5cbce2563567eaa4cef67fc172270
Component: engine
2014-09-11 11:11:01 -07:00
6a8c7d0e92
Merge pull request #7806 from erikh/fix_cmd_handling_in_parser
...
Fix cmd and entrypoint handling in parser
Upstream-commit: 08f1a91ccd39a880645d4dbe8a45173f17cf42fe
Component: engine
2014-09-11 10:42:22 -07:00
17af1eaec1
Add notes about single-quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b47a2fbdc545d649a945e78a22da0c5dd9df0921
Component: engine
2014-09-11 10:19:07 -07:00
2d65e30419
builder: Fix an error check being done at the wrong spot in run
...
dispatcher
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 91bed436215f272c2956abb969425ee0bfd3a998
Component: engine
2014-09-11 06:00:24 -07:00
665c625297
move entrypoint integration-cli test for blank entrypoint to separate function
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
2014-09-11 06:00:24 -07:00
d8ce78da21
Do not populate path to prevent runconfig merge conflict; remove
...
autoConfig seeding of entrypoint.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 92f885d7bd9d4a8f5d30ec650a7625a8727d952e
Component: engine
2014-09-11 06:00:24 -07:00
b3a58e1095
evaluator: ensure entrypoint stays blank if set blank while CMD is set.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
2014-09-11 06:00:24 -07:00
76991d395e
builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
2014-09-11 06:00:24 -07:00
a3d374a131
builder: Fix a small bug that could improperly cache.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3a6d1228a83ba0f9dd96138ccccfa758c0956a62
Component: engine
2014-09-11 06:00:24 -07:00
35b33a60e1
builder/parser: fix handling of empty strings as the only argument.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 6b322ad2d32b1525ad01611f0d6ad8d803f5f6f0
Component: engine
2014-09-11 06:00:24 -07:00
c4ae3304f1
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 234f0e4f79c27a4820f75a504fdcd45b2981a68a
Component: engine
2014-09-11 06:00:24 -07:00
9153ab8851
Fixed a typo in docs (outpu -> output).
...
Signed-off-by: Lakshan Perera <lakshan@laktek.com >
Upstream-commit: 7b1fdd6c0460931d458703e175cba157de9b0246
Component: engine
2014-09-11 09:09:59 +00:00
066f8a742f
Update remote_api_client_libraries.md
...
Adding docker rust client lib.
Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com >
Upstream-commit: c7310b64637ae29a6d7a07b7e533a546e3524654
Component: engine
2014-09-11 03:04:35 -04:00
f444f23973
Fixed typo
...
Upstream-commit: ef3920278e6a07254a6dcd9502254ed25656d552
Component: engine
2014-09-11 08:55:45 +02:00
6556d7f015
engine.Env: comments and tests for Get()
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 6e0bc06018b28ac46689708343b8dd57cae772c2
Component: engine
2014-09-10 22:20:49 -04:00
4dcbf56012
tarsum: TarSum is not the interface
...
don't export the exsisting TarSum struct and call the interface 'TarSum'
instead.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: ec01eb653db9d5e5b9291c1670dde57e7f742874
Component: engine
2014-09-10 21:56:20 -04:00
68ab799b75
Merge pull request #7975 from passy/patch-2
...
Fix link for configuring automated builds
Upstream-commit: 2d1c8bd78647162c7ea7d6bf9390a3d56305eb2d
Component: engine
2014-09-11 09:16:41 +10:00
5886dc651d
Merge branch 'adding_official-repo-guidelines' of https://github.com/fredlf/docker into adding_official-repo-guidelines
...
Conflicts:
docs/sources/docker-hub/official_repos.md
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: dd5657ffd1a60fe89d57f585454a91823b2da516
Component: engine
2014-09-10 14:30:19 -07:00
1fec550074
Fixes a couple small typos
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: a2ba4d56eb134f95eba790bb484e0c8bd77d1fc4
Component: engine
2014-09-10 14:26:03 -07:00
844e4f396f
Fix formatting, change to markdown block for long
...
Signed-off-by: Joe Ferguson <joe@infosiftr.com >
Upstream-commit: bcb9378c5b91f8fd7bc99d1ad0904f5cba6ee613
Component: engine
2014-09-10 14:46:11 -06:00
5f275ccb1b
TarSum: versioning
...
This introduces Versions for TarSum checksums.
Fixes: https://github.com/docker/docker/issues/7526
It preserves current functionality and abstracts the interface for
future flexibility of hashing algorithms. As a POC, the VersionDev
Tarsum does not include the mtime in the checksum calculation, and would
solve https://github.com/docker/docker/issues/7387 though this is not a
settled Version is subject to change until a version number is assigned.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 747f89cd327db9d50251b17797c4d825162226d0
Component: engine
2014-09-10 15:41:52 -04:00
024af24baa
Fix link for configuring automated builds
...
Upstream-commit: ecbc8de2496bb8399a06defb5adfd0860adad788
Component: engine
2014-09-10 21:08:05 +02:00
0d5a02c8f6
Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954
...
Deallocate port before trying to delete iptables chain
Upstream-commit: 25f7840993b9f4ae47b900fcbde67fcd86d537ee
Component: engine
2014-09-09 17:41:26 -07:00
765de5955d
Merge pull request #7897 from LK4D4/refactoring_net_mode
...
Add IsPrivate method for NetworkMode
Upstream-commit: f9c345ddfae25d5512b775968fb14ed1abb00504
Component: engine
2014-09-09 14:20:59 -07:00
53bdf11639
Add IsPrivate method for NetworkMode
...
This method indicates that container using private network stack
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 080ca8619172b020c7da29b46f2fe4c939bb47ca
Component: engine
2014-09-10 00:46:43 +04:00
73455edf0c
Deallocate port before trying to delete iptables chain
...
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 2e7cf6b0cec3e5cc6f05fa5011cf7b5e49a44ae4
Component: engine
2014-09-10 00:40:46 +04:00
1c4a4c9a65
Merge pull request #7921 from unclejack/increase_tarsum_buffer_size
...
pkg/tarsum: make buffer size dynamic
Upstream-commit: 197f9b1e2b5810bbbd38b95b1d68c586033fad7c
Component: engine
2014-09-09 16:10:02 -04:00
0b07be83cc
Add daemon flag to specify public registry mirrors
...
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.
Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com > (github: timbot)
Upstream-commit: 69a75c673ccf0aebf19c7b350243f1b0cefad8be
Component: engine
2014-09-09 19:03:38 +00:00
