3cde46554b
more docs for dockerignore
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c21c55e0b6d0f9582e4ee168fbd518b57dacc8fb
Component: engine
2014-07-01 15:11:18 -04:00
e49c262737
Merge pull request #6787 from vieux/pause_commit2
...
Pause/freeze containers during commit
Upstream-commit: cdc62c778f86070d2d62de5055d6288b916136ee
Component: engine
2014-07-01 10:11:18 -07:00
afd3ebbfd3
updated docs & tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 957c510d729ac3dcbe892b145fb2d9ed766be2ca
Component: engine
2014-07-01 17:10:00 +00:00
0858137a49
Merge pull request #6785 from tiborvass/use_new_libcontainer_state_api
...
Use new libcontainer.State API
Upstream-commit: c41c00cab45149e85f35eb8c98cddec62d332668
Component: engine
2014-07-01 19:44:07 +03:00
75ccf5b4e8
Merge pull request #6796 from jpetazzo/bundled-vs-packaged
...
Add FAQ entry about bundled vs packaged libraries
Upstream-commit: 6ac20416c8da25fb5314ad3d1f6f16cf827274be
Component: engine
2014-07-01 11:11:48 -04:00
7ce2f56d41
Add FAQ entry about bundled vs packaged libraries
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: ae1ff4dea311f8c6ff025b4835dc5d751f1b6261
Component: engine
2014-07-01 07:47:59 -07:00
4dbce92b61
Merge pull request #6366 from proppy/add-proppy-server
...
api/MAINTAINERS: add proppy for server/
Upstream-commit: bc33ce0d8f8b3c3b3e80fbd4084f8a8e74130c0c
Component: engine
2014-06-30 17:44:02 -07:00
ae1f05d70a
Pause/freeze containers during commit
...
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.
Fixes bug: #6267
Fixes bug: #3675
Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com > (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
2014-07-01 00:30:21 +00:00
e07af8c844
Merge pull request #6764 from SvenDowideit/pr_out_blindly_make_all_uses_of_e_g_into_e_g_
...
blindly make all uses of e\.?g\.? into e.g.,
Upstream-commit: 3f18afc94c8b8700884c052c869026ae26c45bb3
Component: engine
2014-07-01 09:57:39 +10:00
413eaeb715
blindly make all uses of e\.?g\.? into e.g.,
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fde10cf87b9f0df6d8aa8683721a6f9d71dda516
Component: engine
2014-07-01 09:55:19 +10:00
7ad4718c9d
Fixed typographical erros in the documentation
...
Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:
https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: SvenDowideit)
Upstream-commit: b44e13ae023816ed9d36b6dc6d74f089fc402cab
Component: engine
2014-07-01 09:54:20 +10:00
b1c7a0a95d
Merge pull request #6749 from LK4D4/update_gorilla_context
...
Update gorilla/context
Upstream-commit: e6d9c097b29a4737973b54dbcb1611c3068608b5
Component: engine
2014-06-30 16:52:34 -07:00
ce22a9b1ec
Use new libcontainer.State API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 262d45e0fe483dbc6d27bc6af51590a8be42d55f
Component: engine
2014-06-30 18:27:15 -04:00
1ae219d16a
Merge pull request #6784 from tianon/NikolaMandic-master
...
Update contrib/mkimage-arch.sh to remove use of "expect" since the output of pacstrap has changed
Upstream-commit: ff45a3cbac58e204b6888fe04052e2e03a1ee66f
Component: engine
2014-06-30 16:04:09 -06:00
f6a9c4ccbd
Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
...
* 'master' of https://github.com/NikolaMandic/docker :
removed expect from mkimage-arch since it was not working
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 75b3b382ca182bf9386bc03726b4edfa41f044e8
Component: engine
2014-06-30 15:52:04 -06:00
795e9b6d57
Merge pull request #6742 from vieux/remove_deprecate_syntax
...
remove deprecated syntax for docker commit
Upstream-commit: 36c78c917240312e5521eccb195ccce31b29d0f8
Component: engine
2014-06-30 10:41:07 -04:00
37f1c826ae
Merge pull request #6682 from erikh/6476-persistent_port_allocation
...
fix persistent port allocation
Upstream-commit: fef1e0a7089820b06fdc2de3d536fe0e5e41f0cb
Component: engine
2014-06-30 10:14:17 -04:00
4ca700fb27
Merge pull request #6766 from jamtur01/clirun
...
Formatting and consistency fixes to CLI and RUN references
Upstream-commit: 7128353be5e475c98c1c7454d7344d71ceefc3ea
Component: engine
2014-06-30 08:21:57 -04:00
b4d4865eb8
Merge pull request #6765 from SvenDowideit/pr_out_use_the_official_image_for_now_there_s_an_opensuse_image_on_its_way
...
use the official image for now - there's an opensuse image on its way
Upstream-commit: 8d1cc686735883f099bcacf78cdc7224b4373bff
Component: engine
2014-06-30 20:00:12 +10:00
4495a1a47f
Merge pull request #6768 from SvenDowideit/add-1.13-api-to-docs-menu
...
Add the 1.13 API docs to the menu
Upstream-commit: 753ff36cc322bceb93e33f4ab42ce1cc9e27d09a
Component: engine
2014-06-30 19:59:39 +10:00
74e9171bcc
Add the 1.13 API docs to the menu
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 26332fe339d4d939d91fe00a0df849d564026005
Component: engine
2014-06-30 14:19:16 +10:00
866640533b
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
Upstream-commit: b4df555d27603621eacbcabb19d1db52bc370c86
Component: engine
2014-06-30 13:16:38 +10:00
ee97bfaf79
Formatting and consistency fixes to CLI and RUN references
...
* Removed double backticks.
* Reformatted paragraphs.
* Fixed consistent STDOUT/STDIN/STDERR references.
* Fixed several broken URLs.
* Fixed backtick mismatches.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 8c765ae68a4a9aceb9886f4d92f2ded7af144e22
Component: engine
2014-06-29 22:25:12 -04:00
08986aa647
use the official image for now - there's an opensuse image on its way
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 24bf8faa99ef7c80aca3ee3a6eac485f74e521ef
Component: engine
2014-06-30 11:46:09 +10:00
91e2c5657a
Merge pull request #6631 from SvenDowideit/add-versioning-to-docs-output
...
Add versioning to docs output
Upstream-commit: 0757a5663a704c5ffd1181b438703d9113dc4c8c
Component: engine
2014-06-30 11:38:04 +10:00
fd51db3de3
Merge pull request #6761 from fgrehm/patch-1
...
Remove extra "Docker" from docs index
Upstream-commit: 860d8e927108d6279c856135c9a348a4ad729afd
Component: engine
2014-06-29 20:14:16 -04:00
a201d5816f
Remove extra "Docker" from docs index
...
Upstream-commit: 3be683a0bbf25f41e9f4b1652f8f0784cafbd05b
Component: engine
2014-06-29 19:45:08 -03:00
88cb9a99d9
Merge pull request #6747 from softprops/master
...
added linkage to tugboat, a scala client library
Upstream-commit: 2075ef029e37d54466a223f68c8837c7b67782c5
Component: engine
2014-06-29 16:21:32 +10:00
5c2debaa25
added linkage to tugboat, a scala client
...
Docker-DCO-1.1-Signed-off-by: Doug Tangren <d.tangren@gmail.com > (github: softprops)
Upstream-commit: 5c0819a0464624eba12b6a37462d549d7fed3be4
Component: engine
2014-06-28 23:21:40 -04:00
bc68396213
Merge pull request #6752 from mchelen/patch-5
...
fix typo
Upstream-commit: 7362a09cd9e3efa3e0e065e5b8d69a9dfd614cf2
Component: engine
2014-06-29 08:29:12 +10:00
205ef46012
Merge pull request #6751 from mchelen/patch-3
...
missing `sudo`
Upstream-commit: 525d41118e05305b5fa9c751096c18d6af8f96c9
Component: engine
2014-06-29 08:28:46 +10:00
889b867878
fix typo
...
Upstream-commit: 0d2656ce6e8536fcdb6d68b5899febe867f59c70
Component: engine
2014-06-28 12:26:36 -04:00
d1e69d47f8
missing sudo
...
Upstream-commit: 4a5f09387e17860ba748d94028cb2a307c9e0b11
Component: engine
2014-06-28 12:01:16 -04:00
953579a767
Update gorilla/context
...
Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ea464ea212aa584dd0aa50820c78f7f60a77450d
Component: engine
2014-06-28 12:38:29 +04:00
67b3725d98
Merge pull request #6741 from fredlf/suse-install-fix
...
Changed add to group command to include -a (append) flag, for safety. In...
Upstream-commit: 4a9dc8d73d3f871f978c9cf19b5d8d646bdc44d5
Component: engine
2014-06-28 10:43:11 +10:00
e9e126ff9c
Merge pull request #6713 from vieux/order_flag
...
sort flags with the same name in a consistent order
Upstream-commit: 1960da1dd069b65642a6410d26f36dd30ad1308f
Component: engine
2014-06-27 17:10:55 -07:00
4d2725fe4d
remove deprecated syntax for docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a0b229071394e6534808f16c4570ed8fd9ff3a1c
Component: engine
2014-06-27 23:09:41 +00:00
229de7479e
portmapper: unit tests for remap problem
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 2cdcfc0c57e375955d3ed7c8e1487f9d4751b255
Component: engine
2014-06-27 15:57:31 -07:00
9af8758aff
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
Upstream-commit: ff206374999966421633a5f20e65e8df22eb2d1b
Component: engine
2014-06-27 14:39:03 -07:00
d6f80e2f4f
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
Upstream-commit: 018f887fe1346415ea6c1d9259dfd7b2bf131025
Component: engine
2014-06-27 14:37:12 -07:00
3aa7eb85d0
Merge pull request #6678 from mheon/fix_man_generate
...
Path fixes in md2man script and README
Upstream-commit: 74a34bb1fefbb9fd97562910a6cce7324f056be6
Component: engine
2014-06-27 14:29:36 -07:00
163b6661da
Merge pull request #6740 from tiborvass/untar_allow_overwrite
...
Allow overwrite in archive.Untar
Upstream-commit: e5d3aa27659837e1847b4ccdc2a1fcbcd326f5dc
Component: engine
2014-06-27 14:15:47 -07:00
b4a009578f
allow overwrite in untar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 5a3d774e5651da772a065282a1fb1a31e19e911c
Component: engine
2014-06-27 17:03:51 -04:00
52930d7389
Merge pull request #6232 from LK4D4/wait_functions_for_state
...
Wait functions for state
Upstream-commit: 680adb98e1fb4efc2116259887016e5d0fdd8c42
Component: engine
2014-06-27 13:33:13 -07:00
b39625ba3c
Merge pull request #6721 from LK4D4/integration_test_on_links
...
Integration cli tests on Links in inspect
Upstream-commit: 3aa75210c4decc0affe2f441d302fbbdec1fbc5c
Component: engine
2014-06-27 13:29:13 -07:00
a9eca6550a
Changed add to group command to include -a (append) flag, for safety. In response to customer email.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 0acec443745a917fb8e97d50609ff01b03888512
Component: engine
2014-06-27 12:45:55 -07:00
91359fcf89
Integration cli tests on Links in inspect
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 08182da5d829762366b9bff9cb27b25a010ad1dd
Component: engine
2014-06-27 22:44:13 +04:00
a3c1ef441a
Merge pull request #6735 from unclejack/add_test_pr-6701
...
Add test for PR 6701
Upstream-commit: 3a50675a688bbe022f1870c38aadb5352e7869e6
Component: engine
2014-06-27 11:05:18 -07:00
d882414368
Merge pull request #6234 from jzupka/fix_check_default_ip
...
Adds check if default ip address is correct format.
Upstream-commit: ade6bd77853a7fd2cabfef1f307823dff284d4b1
Component: engine
2014-06-27 10:53:15 -07:00
4ad46ffe31
Use last allocated port logic in port allocator
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: e77729c2e081c5ce55aa1d4f316b7c7703e5de96
Component: engine
2014-06-27 10:51:26 -07:00
