23cfbb7add
Merge pull request #5629 from vmarmol/fix-systemd-softlimit
...
Remove support for MemoryReservation in systemd systems.
Upstream-commit: 7e3a1b652193abd8379905cb4dac2df53dc634fb
Component: engine
2014-05-06 09:48:33 -07:00
963c5715cb
Merge pull request #5627 from cyphar/integration-cli-fixes
...
Fixed completely broken integration-cli tests
Upstream-commit: d16fcc628e5b3229e24ee50579a81379f4040414
Component: engine
2014-05-06 09:35:30 -07:00
7754f52438
Remove support for MemoryReservation in systemd systems. This has been
...
deperecated since systemd 208.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 69d43b2674aa8ed69c641556cae68d405505a45b
Component: engine
2014-05-06 15:53:38 +00:00
e1bf9e3403
integration-cli: docker_cli_links: fixed broken tests
...
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 924979259ec4c9ef6beab0468325f1cb04deaacb
Component: engine
2014-05-07 01:05:15 +10:00
0dedb88d50
pkg: networkfs: etchosts: fixed tests
...
This patch fixes the fact that the tests for pkg/networkfs/etchosts
couldn't build due to syntax errors.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 14f65ab83b4f72ea56b3e98023e941474d4e9dd8
Component: engine
2014-05-07 00:42:22 +10:00
670dbc4add
Merge pull request #5616 from nirvdrum/patch-2
...
Use the contraction for "it is."
Upstream-commit: ba6a732357ce9e2fa3292ce8b46d17dadfe22468
Component: engine
2014-05-06 11:33:41 +01:00
78dce02460
Simplify integration test for link + hostname.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: dc605c8be76760951d0d12e67409602c7b4b7973
Component: engine
2014-05-05 19:51:47 -07:00
1d128ba235
add linked containers to hosts file
...
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 53f38a14cd6b61a6b5df68cc3694dcba2b0c1eb7
Component: engine
2014-05-05 19:40:27 -07:00
6653f5c1ed
Add alex as devmapper and btrfs maintainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cd818950919f0da868b36e32033607d5e6c98466
Component: engine
2014-05-05 19:40:27 -07:00
e892d9d992
Use the correct "it's."
...
Upstream-commit: 2b0f88383afba28fe7b0bba989d115c2f5e2cc87
Component: engine
2014-05-05 20:08:35 -04:00
9343517f87
Move Attach from container to daemon
...
This moves the Attach method from the container to the daemon. This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 41cfaa738c2d8583ecca50948c9df5eda3dfd7f1
Component: engine
2014-05-05 16:48:56 -07:00
deff094dc8
Merge pull request #5613 from vieux/better_error_handling
...
propagate errors write
Upstream-commit: b4ac4228f518ce3af125752fd46ae667dcff8042
Component: engine
2014-05-05 16:28:15 -07:00
a2cfcf5177
propagate errors write
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 55f3e72d7f6b996c0874d402c95f4b8c9a7d80d9
Component: engine
2014-05-05 23:23:14 +00:00
dfb1a0bff0
Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes
...
cgroups: Update systemd to match fs backend
Upstream-commit: 0b15944cb047e6467f399ebf5c3f93262fe4c06f
Component: engine
2014-05-05 16:00:56 -07:00
80dddf62f3
Merge pull request #5597 from jamtur01/docs-simplify-osx-install
...
Fixed the horrible OSX installation docs
Upstream-commit: df5827dd02f115811ba82bf8ae979ada292967f5
Component: engine
2014-05-06 08:55:14 +10:00
4ec4fca8da
Merge pull request #5609 from crosbymichael/move-env-gen
...
Upstream-commit: 0736eb6d164a58388acb9f6f3993250d76b8665b
Component: engine
2014-05-05 15:52:47 -07:00
155c48e646
Merge pull request #5611 from vieux/networkfs_pkgs
...
add 2 networkfs pkgs
Upstream-commit: ab58dd5a44b4e7d35a20a2156e91a9a52d3d8766
Component: engine
2014-05-05 15:52:14 -07:00
ac35d8965e
add resolvconf
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3744452ecf46351758478e99795e20b186a1bee4
Component: engine
2014-05-05 22:55:32 +00:00
60d5f26ff6
add etchosts
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a1a029f6d7f980960135c1346a1e9f7830692fac
Component: engine
2014-05-05 22:43:38 +00:00
9cb0c5e8bd
Merge pull request #5600 from unclejack/sha512_registry_support
...
import sha512 to make sha512 ssl certs work
Upstream-commit: eadf004fcba8431769b03125a6d6a8d415c79f5f
Component: engine
2014-05-05 15:27:11 -07:00
4d22840b79
Move envconfig generation to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4994b0fe5459996691dde18155a7b712762e8e53
Component: engine
2014-05-05 14:45:14 -07:00
df4270e3f2
Update after namespace refactor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 01fec73ba4cff45ac08c0330ea0d67aff70ebf8e
Component: engine
2014-05-05 13:56:18 -07:00
d5f89ec02b
Merge pull request #4441 from crosbymichael/add-net-flag
...
Add --net flag to docker run and allow host network stack
Upstream-commit: 70fef1460a9d253bdf164d70d7057ec4ee497e08
Component: engine
2014-05-05 13:54:55 -07:00
1952f255b6
Merge pull request #5602 from crosbymichael/libcontainer-enable
...
Improve libcontainer namespace and cap format
Upstream-commit: 2165a4993b849c3ac4a6f3ccb7af91b0d1f79b50
Component: engine
2014-05-05 13:50:08 -07:00
8b6dc7dcb1
Merge pull request #5575 from vieux/pr-5428
...
Upstream-commit: 51933bd5e1d10eb4a3151088cf344d0d6e06a192
Component: engine
2014-05-05 13:48:36 -07:00
0bd739f261
Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers
...
Upstream-commit: 7c3a06634b8aeb10494d924d5461566aa7228a87
Component: engine
2014-05-05 13:48:11 -07:00
4c66bae2c4
Merge pull request #5596 from dotcloud/contrib-fix
...
Post-commit hook URL fix
Upstream-commit: 07db13509b1e793e37a826fed2bd3924b5b85862
Component: engine
2014-05-05 13:44:48 -07:00
db1f1daa38
Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
...
Upstream-commit: 99be2353329c7106958a852eb08776fac5c0c2b0
Component: engine
2014-05-05 13:41:43 -07:00
dee350b3ad
Merge pull request #5604 from nirvdrum/patch-1
...
It's its.
Upstream-commit: 13c1865541bf368cf3e8955559ae03704fae2a3c
Component: engine
2014-05-05 21:49:47 +02:00
9af67222a6
Merge pull request #5580 from tianon/update-vendor-versions
...
Update vendored deps that have a proper version number to use said specific versions
Upstream-commit: 168452f9b03651e979f99647865c199d497d2051
Component: engine
2014-05-05 13:45:03 -06:00
dae2f35ca5
It's its.
...
Upstream-commit: b25208ee3e4d652d8b1f86ffac343b718118b745
Component: engine
2014-05-05 15:43:11 -04:00
41f42a620b
Improve libcontainer namespace and cap format
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: db5f6b4aa0b34adbc9ba189a042e77e7bcdee681
Component: engine
2014-05-05 12:34:21 -07:00
1812682982
Merge pull request #5544 from vieux/cleanup_api_client
...
Cleanup api client
Upstream-commit: 34e09afa24503e03d74f93f110ce752c38f39071
Component: engine
2014-05-05 11:16:57 -07:00
074dcc8171
cgroups: Update systemd to match fs backend
...
This updates systemd.Apply to match the fs backend by:
* Always join blockio controller (for stats)
* Support CpusetCpus
* Support MemorySwap
Also, it removes the generic UnitProperties in favour of a single
option to set the slice.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5b094530c09bca403819c06635c2f7fbaf98b937
Component: engine
2014-05-05 20:06:44 +02:00
af1152733c
Merge pull request #5591 from alexlarsson/fix-expose-parsing
...
nat: Fix --expose protocol parsing
Upstream-commit: e3d6898da1c1691b8c4ad215d0123e9d87879bcd
Component: engine
2014-05-05 10:32:26 -07:00
ca6804672b
import sha512 to make sha512 ssl certs work
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 7da186c3e58c83605f0389d1214909b1cbbead39
Component: engine
2014-05-05 20:29:20 +03:00
b560ddbfed
Merge pull request #5496 from unclejack/check_if_root
...
check if the daemon is run as root on startup
Upstream-commit: 5f301191cfd16d6898514112658e91eaaff238b3
Component: engine
2014-05-05 10:13:17 -07:00
eebd02a00b
Merge pull request #5569 from vieux/add__ping_to_the_API
...
Add ping to the api
Upstream-commit: f369278725a2c31f5fa2ba2da33ad513f54a5897
Component: engine
2014-05-05 10:09:31 -07:00
1cb3e810da
Address code review feedback
...
Also make sure we copy the joining containers hosts and resolv.conf with
the hostname if we are joining it's network stack.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0b187b909be1dac60194250bc6e9ff292a0bd5c9
Component: engine
2014-05-05 10:08:59 -07:00
ab8f143867
Add docs for --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c1c6b3ccd915084bc9472992afa16f677a074785
Component: engine
2014-05-05 10:08:59 -07:00
5fdf7d4579
Update host networking with hostname and files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5ca6532011436eee85ccb555a0832a82450454ea
Component: engine
2014-05-05 10:08:59 -07:00
0fcf738183
Setup host networking for lxc and native
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a785882b29b9f0b24ace8249576c5d8d7f8c1d94
Component: engine
2014-05-05 10:08:59 -07:00
ad111d4199
Update --net flags and container mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2c2cc051d831f54d1bb070642edcd876ff669e78
Component: engine
2014-05-05 10:08:59 -07:00
bb0461e564
runconfig/parse: add test for parseNetMode
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 7118416aeeb779373685d192c26a329e9acdef89
Component: engine
2014-05-05 10:08:59 -07:00
381004dc30
runconfig: add -net container:name option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: a60159f3b102244fc5470642bd32eb99d5ac329c
Component: engine
2014-05-05 10:08:59 -07:00
60d8f8a368
Merge pull request #5562 from rhatdan/master
...
Fix docker man page to reference selinux-enable flag
Upstream-commit: d103f0186a041749bbddc19439f852acdb0b7a1e
Component: engine
2014-05-05 10:34:49 -06:00
a347ba17b5
Fixed the horrible OSX installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: c34bb099e51300f4355f949cc514bab8370c82c1
Component: engine
2014-05-05 17:02:03 +02:00
339b3d71d5
Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
...
Several OSX install reader issues fixed
Upstream-commit: 30d458c53414e6b55506c5fa841a0cac7c8c64d4
Component: engine
2014-05-05 16:46:03 +02:00
0cfb634c08
Post-commit hook URL fix
...
Updating CONTRIBUTING to include the correct URL for the post-commit hook.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: 10766e1fb46770a407b2b17ade313dd5ae85054e
Component: engine
2014-05-05 10:28:52 -04:00
7225779c77
Several reader issues fixed
...
- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 56d71ae79bbbdd0d1eb97408c6132687a33ec113
Component: engine
2014-05-05 22:52:12 +10:00
