a398a30f36
Merge pull request #6053 from jamtur01/produpdate
...
Removed Docker production warnings
Upstream-commit: d53eb2f67cbdd632d6e4cad8de9d8f654baa96a3
Component: engine
2014-05-27 18:00:49 -07:00
ea93628b07
Merge pull request #6044 from zdover23/27May_dockerfile_2
...
27 may dockerfile 2
Upstream-commit: 58a0e8af8af0989139a3d3c6c3cae1fc30ae24de
Component: engine
2014-05-28 07:58:02 +10:00
f0d03df9d1
Merge pull request #6040 from SvenDowideit/installer-docs
...
Rewrite the mac and windows docs to use the boot2docker installers.
Upstream-commit: b76302e5d91da7b66fe0141f4a67636074c886a9
Component: engine
2014-05-28 07:57:43 +10:00
9f78769fba
Rewrite the mac and windows docs to use the boot2docker installers.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5f5d66ade63f8040dd14114f2c7161b16a806c5c
Component: engine
2014-05-28 07:56:15 +10:00
2d2f74e79d
Merge pull request #6005 from jimperrin/master
...
Updated documentation to include CentOS installation instructions.
Upstream-commit: 080d8a7a8367dcf7bdbcac00ec99fbfb05c7ab51
Component: engine
2014-05-28 07:55:03 +10:00
2296bc83e2
Merge pull request #6063 from vieux/improve_number_detection
...
improve numeric only id detection
Upstream-commit: 70c6d806c8f43a91a324a352f69648a47c843335
Component: engine
2014-05-28 00:36:57 +03:00
dc559e048a
improve numeric only id detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f2baa364a13ea3e22719e3637bf6f5f42e5dc677
Component: engine
2014-05-27 21:03:12 +00:00
0ef8d97b63
Update lxc to use cmd.Wait()
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5310e8575f5a251000bbecd6d998eb11cb95fe04
Component: engine
2014-05-27 13:52:05 -07:00
562071c97e
Update wait calls to call Wait on Command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b9de22e82860a7e389f356d349ccb61b7d530c54
Component: engine
2014-05-27 13:38:24 -07:00
e0a89dbf86
Merge pull request #6059 from erikh/fix-tests
...
Fix race condition in CLI tests: diff was not acquiring a container lock
Upstream-commit: a60537992710edce4095b987f6e19ad0aea34ffa
Component: engine
2014-05-27 13:19:32 -07:00
37b20aec53
Merge pull request #6025 from crosbymichael/concurrent-names
...
Improve name generation on concurrent requests
Upstream-commit: 0d9a5ce6dd061089a3a485bf359a054d83b74059
Component: engine
2014-05-27 23:18:19 +03:00
3ed3d24076
Fix race condition in CLI tests: diff was not acquiring a container lock
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 8b77e0183eaa7b3a87921f9655e2799d300bf775
Component: engine
2014-05-27 12:28:31 -07:00
efa2549ad1
libcontainer/nsinit: remove Wait call from Exec and Kill from Attach in tty_term.go
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: b01c3283fafa01228a566e128dbf4b016c308d04
Component: engine
2014-05-27 12:26:56 -07:00
05b57dfef1
Add Wait() calls in the appropriate spots
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 92e41a02ce40c7d3446b8ca7ec5c5671ac3d8917
Component: engine
2014-05-27 12:26:56 -07:00
3feecdd11d
Merge pull request #5937 from LK4D4/ipallocator_refactoring
...
Ip allocator refactoring
Upstream-commit: bdb5aa4c27b375cc8cd59fd6fa26ec10c23e58f9
Component: engine
2014-05-27 12:22:36 -07:00
16451e9bb0
Merge pull request #6051 from LK4D4/move_some_build_tests_to_integration_cli
...
Move some build tests to integration cli
Upstream-commit: b904d0af561eab7a1663d20e913c3fd720118a0a
Component: engine
2014-05-27 12:11:42 -07:00
3df190d391
Merge pull request #6000 from cyphar/5619-fix-unsafe-path-resolution
...
Properly handle paths with symlink path components
Upstream-commit: 754797bba7e9e18a94ed73c8f94fa91973e547c3
Component: engine
2014-05-27 12:06:19 -07:00
d8e73d4132
Ip allocator refactoring
...
We don't need ordered set anymore, also some cleanings and simple
benchmark.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ef94ac7d2fd42a09c99567b0393fb48b9d782a9e
Component: engine
2014-05-27 22:56:26 +04:00
4505a4d461
Merge pull request #5983 from vieux/add_tianon_mailmap_authors
...
add Tianon as maintainer of AUTHORS and .mailmap
Upstream-commit: a22622b0223c922a75e2a6ec58c490de31623c2c
Component: engine
2014-05-27 10:43:17 -07:00
2d0986f24f
fixed spacing, removed extraneous line
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Upstream-commit: 2bbf87504bc9eb6ee9a4694ce4d1d98287bccbc9
Component: engine
2014-05-28 03:32:52 +10:00
b0d8dff201
Merge pull request #6029 from jeffreybolle/master
...
Update upstart script to ensure networking is up before starting docker
Upstream-commit: b2cf28306dce561b5c5d14057c848e445e733fef
Component: engine
2014-05-27 11:23:54 -06:00
de60cddde3
Removed Docker production warnings
...
* Removed warnings.
* Removed inconsistent Community installation sections.
* Fixed all installation page descriptions.
* Removed old .inc files.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 838e69e11e15dcf6cc1bc73f26602f814ce3698c
Component: engine
2014-05-27 13:08:19 -04:00
aef0b90283
Update documentation per suggestions from ostezer
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: b7e88250f421d34d25f89737c65954150248ee28
Component: engine
2014-05-27 08:59:30 -05:00
94670aa7c3
Update ubuntulinux.md and debian.md
...
to add bash completion for the docker command
Upstream-commit: 250229605f895226fa868120f1a0ea7f4928bf8c
Component: engine
2014-05-27 14:17:01 +02:00
d887d96ffe
Move entrypoint build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: b25a9b7138e44950bee646c1bcb691a3dd273ea1
Component: engine
2014-05-27 08:36:38 +04:00
ed1a6f580d
Move expose build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 81d16411398c20a7ddc0bbe3e5e1ce0bd95d6519
Component: engine
2014-05-27 08:00:35 +04:00
26be5cc632
Move cmd build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c58991f31a6a2ceaee7a3a327bfbc697b059ff51
Component: engine
2014-05-27 08:00:35 +04:00
966a80b8ce
Move env build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: b05be686ec490ba68de82434f1ecaff01a84fcfa
Component: engine
2014-05-27 08:00:35 +04:00
23e7a90af8
Move relative workdir build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 40630ce4b65755683e496bb7dbf3779b96ec5393
Component: engine
2014-05-27 08:00:35 +04:00
cfeef64a2d
Move user build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 360fb3d4ea192e28a4d2579589cd16954bb959c1
Component: engine
2014-05-27 08:00:34 +04:00
07ea87f779
Move maintainer build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 3dd4c5f49977bb9538ae1c39605895fde69c86ee
Component: engine
2014-05-27 08:00:34 +04:00
ee7d24f0a0
Move volume build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 11f7f0bf9b510e09a853a9fd2030a95b72462164
Component: engine
2014-05-27 08:00:34 +04:00
7e9d849ecc
Update fedora.md
...
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
Upstream-commit: b26bebac318803d9dbcd908ccc3be4f2fb9a88b8
Component: engine
2014-05-26 12:29:27 +01:00
cdddc7f9a6
Merge pull request #6039 from zdover23/26May_dockerfile
...
Dockerfile.5.md stub
Upstream-commit: 4a2ca56ea0b5bff797c3d1150c18f5797e58c839
Component: engine
2014-05-26 16:46:12 +10:00
4c7d9e6500
Dockerfile.5.md stub
...
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: )
Upstream-commit: 41a913b3906348f6ec3f1929e6d33926c84c1bf1
Component: engine
2014-05-26 15:57:20 +10:00
7cbab5a63c
Fix embarrassing debootstrap typo :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: dd3319636d749bac3d57fbcd1c3cf4d31fded8b7
Component: engine
2014-05-25 21:59:43 -06:00
335a844d29
Ensure networking is up before starting docker
...
This resolves a problem that I have been having where docker starts before networking is up. See issue #5944 for more details.
Docker-DCO-1.1-Signed-off-by: Jeffrey Bolle <jeffreybolle@gmail.com > (github: jeffreybolle)
Upstream-commit: c52889db27a2af09ed7f6c92f2d6c6fd9737bf63
Component: engine
2014-05-24 19:03:11 +01:00
feece77cd3
Merge pull request #6001 from jamtur01/introfixes
...
Some fixes to the Intro pages
Upstream-commit: 7393eafde79f67459755ef98d1718c25497783e3
Component: engine
2014-05-25 00:21:40 +10:00
438f9224cd
Some fixes to the Intro pages
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 955bfda99a991e71af3352d18a007d39970cc508
Component: engine
2014-05-25 00:20:59 +10:00
584879665e
Correct appearance of shell output
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: 1cb2570a276020749a0b87444b17f4e6ce78b92d
Component: engine
2014-05-24 08:33:41 -05:00
13006b0ee7
Merge pull request #6006 from therealprologic/master
...
Updated installation docs for CRUX as a Docker Host.
Upstream-commit: 22777fbc1e5439883d2e1d5e4fa0e004ea9f4289
Component: engine
2014-05-24 16:08:14 +10:00
dd4e9e1b3f
Merge pull request #6016 from ronsmits/patch-1
...
Update using_supervisord.md
Upstream-commit: d81912e32313a33cb3ad9c1670e7d61effc9517b
Component: engine
2014-05-24 16:07:32 +10:00
ce6aa0bad5
integration-cli: cp: added symlink-related tests
...
This patch adds cli integration tests for #5619 , which are tests
to ensure that symlinks are kept relative to the container rootfs
(even when a path component).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: ff24a328765335d9bff1babaac4fac6cf4180af6
Component: engine
2014-05-24 11:01:20 +10:00
e52cd2deb7
daemon: container: properly handle paths with symlink path components
...
This patch fixes the incorrect handling of paths which contain a
symlink as a path component when copying data from a container.
Essentially, this patch changes the container.Copy() method to
first "resolve" the resource by resolving all of symlinks encountered
in the path relative to the container's rootfs (using pkg/symlink).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 328d2cba116067a2ad0f161b9ee098ed024825b3
Component: engine
2014-05-24 11:01:19 +10:00
150de13c9e
Improve name generation on concurrent requests
...
Fixes #2586
This fixes a few races where the name generator asks if a name is free
but another container takes the name before it can be reserved. This
solves this by generating the name and setting it. If the set fails
with a non unique error then we try again.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6ec86cb6e517bfb5ded818244b9db9510a2ed0b9
Component: engine
2014-05-23 17:51:16 -07:00
c6fc71df20
docs/reference/builder: fix USER doc
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e89cb9a5e0105afbb0c1ba1176bda07d110295bc
Component: engine
2014-05-23 17:20:15 -07:00
7f0603ffdf
Merge pull request #6020 from vieux/update_test_remove_nc_bind_mount
...
now busybox as nc
Upstream-commit: baed5d74339407fcc04277d264aa31a995719c75
Component: engine
2014-05-23 14:48:24 -07:00
4f4dc73aee
Merge pull request #6018 from vishh/stats_strongtype
...
Strong type all stats exported by libcontainer
Upstream-commit: 3b4b0a901de138d72ac4da5376055cdc14656307
Component: engine
2014-05-23 14:35:14 -07:00
b33af77b2c
Add check for iptables xlock support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 034babf1753741184c1155a7346ecec86fc51e2c
Component: engine
2014-05-23 14:18:50 -07:00
418706706b
now busybox as nc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0be44d1a0a2dfd70c35367d7ee8383feeab8d3b9
Component: engine
2014-05-23 21:03:52 +00:00
