ee4e3699c5
* do not consider iptables' output an error in case of xtables lock
...
Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com > (github: gdm85)
Upstream-commit: 5e3b643ce6f43d02fc7fe88eba41d583044a2efd
Component: engine
2014-05-29 15:57:29 +02:00
6a08eb7c32
Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images
...
docs/installation/google: update to use container-vm images
Upstream-commit: 8622641b585d18476f1bc26e1bb5d4298cecf78f
Component: engine
2014-05-29 11:41:43 +10:00
9e0e3e5d33
docs/installation/google: update to use container-vm images
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 456ba11d89b52f946d293489b52508a2e270f1a7
Component: engine
2014-05-29 11:36:28 +10:00
62daf025f0
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl > (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
d45f77737e
Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user
...
SETUID/SETGID not required for changing user
Upstream-commit: b204b97c9adbaddd5b8cef3dc53cbee2a392b936
Component: engine
2014-05-28 17:29:17 -07:00
3efba6310d
Merge pull request #5402 from SvenDowideit/dont-update-authors
...
Don't add yourself to the AUTHORs file - its generated
Upstream-commit: 341a2b85beb04132814dfc884c25e425e4df20bd
Component: engine
2014-05-29 02:00:29 +03:00
d63e421f0f
Merge pull request #6067 from SvenDowideit/go-fmt-s
...
gofmt does not result in the same thing as go fmt -s, which is what travis uses
Upstream-commit: 745445ebb729617e9ec7907fd4d7e2467a857ba1
Component: engine
2014-05-29 01:58:03 +03:00
503e230354
libcontainer: Don't create a device node on /dev/console to bind mount on
...
There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 7f5cd76824b500418ed168dfcfeb73de8badcb51
Component: engine
2014-05-28 21:07:40 +02:00
3731289bf5
Revert "Remove the bind mount for dev/console which override the mknod/label"
...
This reverts commit ae85dd54582e94d36b146ab1688844ed58cc8df3.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 35d08bdd01e3c63414d7998efc0813803e2ba5d9
Component: engine
2014-05-28 21:07:27 +02:00
003f6776a9
Merge pull request #6076 from LK4D4/remove_collections_package
...
Remove collections package
Upstream-commit: 2330be2adc1efe35b0f09af69287a5bd58ee7456
Component: engine
2014-05-28 21:32:27 +03:00
ea766a12d8
Merge pull request #5868 from jhspaybar/5749-libcontainerroutes
...
libcontainer support for arbitrary route table entries
Upstream-commit: 5e2af0713735d6724179540d4d1b0827ab8c4570
Component: engine
2014-05-28 10:50:56 -07:00
fc7b9b154d
Fixes #5749
...
libcontainer support for arbitrary route table entries
Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com > (github: jhspaybar)
Upstream-commit: bf7f360dcac38037d5c4f9e2e90d01adc240ed2b
Component: engine
2014-05-28 17:42:02 +00:00
9a698bd723
SETUID/SETGID not required for changing user
...
It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
Upstream-commit: 0563453b918b47c1f9d1e05b8650d2c8bf7ac3af
Component: engine
2014-05-28 16:41:48 +02:00
a9a33a3f25
Add system.SetKeepCaps and system.ClearKeepCaps
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com > (github: bernerdschaefer)
Upstream-commit: fd58524f81031eec112b5e9bd52bfaa186fc9c20
Component: engine
2014-05-28 16:40:36 +02:00
775ca94cb2
Merge pull request #5957 from cgwalters/manpage-typo
...
docker-run.1: Fix typo 'priviledged'
Upstream-commit: f00c2e5007cb7843c2bcea53e4a86835d3d5a958
Component: engine
2014-05-28 22:43:46 +10:00
9dd5fe97c9
Remove collections package
...
It doesn't needed anymore аfter port and ip allocators refactoring
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4dmath@gmail.com > (github: LK4D4)
Upstream-commit: 31f0a61a3dfabe363d08d4ff55e8a1efb29d84eb
Component: engine
2014-05-28 13:59:45 +04:00
f50254f41e
Merge pull request #6068 from jpetazzo/update-wording-private-self-hosted-registries
...
Replace 'private' with 'self-hosted' in a couple of places
Upstream-commit: 77ae37a3836997d215ed3f1750533a9815205695
Component: engine
2014-05-28 14:39:05 +10:00
5ea7137278
Return devmapper errors with additional text
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 69640123826cf73d3d83182cb81e5de4ad0cc3a7
Component: engine
2014-05-27 19:03:57 -07:00
8f1ec933f0
Replace 'private' with 'self-hosted' in a couple of places
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: b64535166f4e930121bf9cb624bf2d044c97e472
Component: engine
2014-05-27 18:57:25 -07:00
17bb4fbe20
gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 147ad3480da6c9e966b1db0d9d607dc6b1483327
Component: engine
2014-05-28 11:11:47 +10:00
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
