bb99db485b
Engine: break out Env utilities into their own type - Env
...
Upstream-commit: a80c059baeff0b7d563499e963059a183c7e1bd9
Component: engine
2013-12-08 06:06:05 +00:00
8eb7425cfe
Merge pull request #3101 from creack/merge_release
...
Merge release
Upstream-commit: f4676f0ffa76576e5147994cead82ce19804158f
Component: engine
2013-12-06 18:09:38 -08:00
f39a822707
Update version
...
Upstream-commit: 3c1f3be032be4cd4a8c9235ed35e3a269e5f524e
Component: engine
2013-12-06 17:31:09 -08:00
aa55ca5f8a
Merge remote-tracking branch 'origin/release' into merge_release
...
Upstream-commit: aeba4e64824b5530c0c5e2aa3d840ca5501028bf
Component: engine
2013-12-06 17:30:52 -08:00
92cd51b7ef
Merge pull request #3098 from creack/bump_v0.7.1
...
Bump v0.7.1
Upstream-commit: 88df052197fc16f578ed0551ad654dd67bb3a39a
Component: engine
2013-12-06 14:42:14 -08:00
f627dc9f6a
Merge pull request #3077 from jlhawn/3076-handle-inactive-user-login
...
Adjusted handling of inactive user login
Upstream-commit: 04ffa53ba803b4ce605ae5c048edbd1de4cc4129
Component: engine
2013-12-06 14:40:35 -08:00
a30df829ac
Merge pull request #3030 from jamtur01/versions
...
Fixed #2136 - Added styles
Upstream-commit: 07f7643bbc98dd43dd073a128c33495d55b099d4
Component: engine
2013-12-06 14:27:53 -08:00
6ca0e7d37f
Merge pull request #3094 from tang0th/patch-1
...
Update archlinux.rst as packages have changed
Upstream-commit: 6fa1463614b810d725763a20aec1fb4b8c4d1c22
Component: engine
2013-12-06 14:18:31 -08:00
9bc490e068
disable progressbar in non-terminal
...
Upstream-commit: f28445254f42fd112aba5f2b67ae6169fae29c2b
Component: engine
2013-12-06 14:15:40 -08:00
03972ad6f7
update doc
...
Upstream-commit: 0969be5ddb34ee8a6c09e882d13b1d655e028b23
Component: engine
2013-12-06 14:15:40 -08:00
0e3983757b
fix jsonmessage in build
...
Upstream-commit: 95c0ade04bb8fe95029fed521126e3268a1eda7f
Component: engine
2013-12-06 14:15:40 -08:00
bc477123cb
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b2b5d86059c6004e60ba23b03d30fe0.
After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations."
Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces.
The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.
Upstream-commit: e01732f85769ac434e2614652aa25cd0ace7a4df
Component: engine
2013-12-06 14:15:40 -08:00
a63c2448f6
Merge pull request #3096 from dotcloud/fix_fix_jsonmessage
...
fix jsonmessage in build
Upstream-commit: 9b644ff2463fe3ffb4fdc186ffc6c272078e3d56
Component: engine
2013-12-06 14:10:24 -08:00
e5b8f32fec
disable progressbar in non-terminal
...
Upstream-commit: 2c646b2d466b1401fccbfd453a68f0023dd5e300
Component: engine
2013-12-06 14:09:27 -08:00
c3791e2e87
update doc
...
Upstream-commit: becb13dc26e8b40be4eec2da933705b2a378db35
Component: engine
2013-12-06 14:09:27 -08:00
d92518e8b2
fix jsonmessage in build
...
Upstream-commit: 05f416d869777aa613a5a197ad287c18b77366d3
Component: engine
2013-12-06 14:09:27 -08:00
bd0ac498d1
Merge pull request #3088 from SvenDowideit/start-cmdline-examples-with-dollar-for-easier-testing
...
change the policy wrt $ sudo docker to simplify auto-testing
Upstream-commit: 7fd64e0196fec3a3a30c6d3359989e1f83074207
Component: engine
2013-12-06 13:37:02 -08:00
46d11941b1
change the policy wrt $ sudo docker to simplify auto-testing
...
Upstream-commit: 13da09d22bcae553cb11b5f906d3c260db571b7d
Component: engine
2013-12-07 07:23:53 +10:00
db8076813b
Adjusted handling of inactive user login
...
The return status for inactive users was being checked
too early in the process, so I moved it from just after
the handling of POST /v1/users/ to after getting the
response from GET /v1/users/
Upstream-commit: 6720bfb24312a558a27453ce104beeb04c53ec68
Component: engine
2013-12-06 11:57:05 -08:00
f1753d066b
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
Upstream-commit: d75fc6e529a4a7279829f4229c474adf29514b8b
Component: engine
2013-12-06 11:25:10 -08:00
f296451534
Merge pull request #3052 from shawnl/patch-1
...
nftables dependancies in kernel
Upstream-commit: 4a148919c3c988f3ade8c4564c65de7f9816c15b
Component: engine
2013-12-06 11:02:49 -08:00
2399b9ff21
Merge pull request #3079 from crosbymichael/give-engine-noop-tests
...
Enable engine to take Stderr and Stdout for mocking in tests
Upstream-commit: c7d75588f412edca2f71960bb99cf20437b7f39a
Component: engine
2013-12-06 10:43:39 -08:00
98995e52ad
Merge pull request #3095 from jpoimboe/missing-defines
...
devmapper: add missing defines
Upstream-commit: dfade9e2d81d13b35b0242bb72bf88303ac7fe9a
Component: engine
2013-12-06 10:31:42 -08:00
ca965db924
Merge pull request #3085 from tianon/fix-cgroup-dep
...
Revert "Add cgroup-bin dependency to our Ubuntu package"
Upstream-commit: b655406faa11a0d42db80008074393d7e68447cd
Component: engine
2013-12-06 09:15:41 -08:00
07db46c5e4
devmapper: add missing defines
...
Add some missing defines which are needed for compiling on older systems
like RHEL 6.
Upstream-commit: a015f38f4a886518828fe3807ee7dc9ff8ab9585
Component: engine
2013-12-06 10:13:47 -06:00
8dbc8f134f
Update archlinux.rst as packages have changed
...
The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed.
Upstream-commit: 02ef8ec3ca1a9b16b905b671ade74cf24d11bb3a
Component: engine
2013-12-06 15:47:24 +00:00
8c54ea502c
Enable engine to take Stderr and Stdout for mocking in tests
...
Upstream-commit: 25d3db048e761ee2c61a2cc8d58196786616988b
Component: engine
2013-12-06 01:18:18 -08:00
7e3fb2e06b
specific kernel config
...
Upstream-commit: a69bb25820df8951151c8c6cb5952ba5496463db
Component: engine
2013-12-05 23:54:23 -08:00
86392dd452
Merge pull request #3086 from metalivedev/3045-addmirrors
...
Add debian mirrors. Fixes #3045 .
Upstream-commit: 5f5949f6a695cd0e80275d95872580ededa46a81
Component: engine
2013-12-05 18:16:28 -08:00
6671f362c6
Add debian mirrors. Fixes #3045 .
...
Upstream-commit: 58b75f8f29b5fff388ec3d8d84249e122462c137
Component: engine
2013-12-05 18:08:56 -08:00
f35e7a7cde
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b2b5d86059c6004e60ba23b03d30fe0.
After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations."
Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces.
The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.
Upstream-commit: aea7418d8ac73f072a47affcaab04831c2f43bc2
Component: engine
2013-12-05 19:03:47 -07:00
900b5e498f
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: f9147effac69e9746b6aae5af9d37bf437aa6c2d
Component: engine
2013-12-05 17:40:42 -08:00
1a871cfdd1
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
Upstream-commit: 0e2b0f284c1acfbb152ccca77417b4e132a4355b
Component: engine
2013-12-05 17:35:51 -08:00
5115cf8685
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
Upstream-commit: 80dfa23da8359618a2453cb1cb3cb5fa69bb71f8
Component: engine
2013-12-05 17:29:54 -08:00
37a16dd5d2
Merge pull request #3081 from creack/bump_0.7.1
...
Bump to 0.7.1
Upstream-commit: bc9b239d74365d5b892c5a424f61065c7e7d84cc
Component: engine
2013-12-05 17:19:06 -08:00
fec117a06e
Clean up quoting, wraps, and build error on code-block.
...
Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938
Component: engine
2013-12-05 17:16:31 -08:00
41a5e644a5
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
...
Upstream-commit: ea0ed9a9159de98c444c6a83649ae2eb51da1c84
Component: engine
2013-12-05 17:03:26 -08:00
b525e44e89
Bump to 0.7.1
...
Upstream-commit: e39d35dedad1db952c30958303902b4c96e1f406
Component: engine
2013-12-05 16:49:39 -08:00
522f629592
Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
...
If container does not exist try to remove the name and continue
Upstream-commit: 4acd5792260fb688e13242b55edea938382e2ba3
Component: engine
2013-12-05 16:41:43 -08:00
bd4e7f6cb9
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
Upstream-commit: c764fb0c294a37b6cf9aad68822be9b349449e6e
Component: engine
2013-12-05 16:41:01 -08:00
90d525a632
Merge branch 'master' into release
...
Conflicts:
commands.go
Upstream-commit: de090116ddf400d5ab8375ed43c9c8d22ec0053f
Component: engine
2013-12-05 16:40:24 -08:00
f3927b33a8
Merge pull request #2955 from crosbymichael/search-name-first
...
Search for repo first before image id
Upstream-commit: 7a870235879462bc929f147e96927d2a5caeb407
Component: engine
2013-12-05 16:16:55 -08:00
9b49298d93
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
Upstream-commit: 584164177ea0036c4d3503bf45645b44a9bb05d5
Component: engine
2013-12-05 16:07:59 -08:00
3365b34767
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
Upstream-commit: 35e80868addd9ac5a2c1e006e650ac3e71f52c6a
Component: engine
2013-12-05 16:04:09 -08:00
abd44b15ab
Merge pull request #2983 from tianon/udev
...
Add udev rules files for hiding the docker loopback devices from udisks
Upstream-commit: 2acea6090f6071b66f546f4de72a7e59731ab467
Component: engine
2013-12-05 16:01:04 -08:00
dd568b3dd1
Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation
...
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
Upstream-commit: 81b25fde7998cb9f5720844e5d487f73c7942d07
Component: engine
2013-12-05 15:27:36 -08:00
8a00a3de0b
Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
...
Some examples didnt use $ sudo docker, so this makes it a little more consistent
Upstream-commit: 0189a994715f0ca141c7af289ede6d553c12b78e
Component: engine
2013-12-05 15:25:09 -08:00
738aed6186
If container does not exist try to remove the name and continue
...
Upstream-commit: 7bf3a07371bb0baed21b59d60835ed2f4877b571
Component: engine
2013-12-05 15:22:21 -08:00
c8f60ad629
Merge pull request #3061 from shykes/sven-doc-maintainers
...
Add Sven Dowideit to docs maintainers
Upstream-commit: 9320f4e2d1caf0b3d84388808c23767543987fd0
Component: engine
2013-12-05 15:17:34 -08:00
b5ccf77471
Merge pull request #3075 from dotcloud/pull_layers
...
Wait on pull from another client
Upstream-commit: d1a4f83e5ec4b332c0d61ace7b03da5de2f6bebd
Component: engine
2013-12-05 14:47:39 -08:00
