ca9e7bd94d
Add -bip flag: allow specification of dynamic bridge IP via CIDR
...
e.g.:
```
docker -d -bip "10.10.0.1/16"
```
If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
Upstream-commit: a68d7f3d70ab1638fd5b63a3026b211cb4e7a65e
Component: engine
2013-12-13 10:47:19 -05:00
0675a87be6
make docs is more consistent
...
Upstream-commit: 27646c445951b47a728675764d7ef2b198436156
Component: engine
2013-12-11 10:14:56 +10:00
f1ea4ce449
Merge pull request #3113 from shykes/engine-export
...
Move 'docker export' to the engine API
Upstream-commit: 0025e9bd719b1cd8314543019ed8e6f6bc5c57cd
Component: engine
2013-12-10 13:28:24 -08:00
84ef86d05d
don't open bind mounted files/dirs to get Stat, use os.Lstat
...
Upstream-commit: 761184df5295b72c5d1ab4549dcddb54977da487
Component: engine
2013-12-10 12:49:53 -06:00
cdb25c470c
Merge pull request #3103 from metalivedev/1229-titleactions
...
Update "Use" titles to be action-oriented
Upstream-commit: 8814c11b140fbcda266c5168340431044f59aa30
Component: engine
2013-12-09 18:57:48 -08:00
8644761a3b
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
Upstream-commit: 09d2c2351c4b016d57f979990698838a94173ec4
Component: engine
2013-12-09 17:35:44 -08:00
1bde8bd6e1
Fix #1229 . Update titles, fix some wrapping.
...
Make the Ambassador container explicit.
Apply Sven's suggestions.
Upstream-commit: 9c1e9a5157b3ef7627f4b735c2b8b6d97f26dd53
Component: engine
2013-12-09 17:23:56 -08:00
e09eb89d48
Merge pull request #3146 from jamtur01/linkedits
...
Some minor cleanup of the Links use document
Upstream-commit: 0b0b0ca0f915bcbe79923b313fb45be6253d8ade
Component: engine
2013-12-09 17:09:59 -08:00
5584948c34
Some minor cleanup of the Links use document
...
Upstream-commit: c9cedb4c0484c3e1879495ab5c02088ae738763e
Component: engine
2013-12-09 16:47:19 -08:00
2ddcfd0b85
Merge pull request #2843 from shykes/engine-job-wait
...
New engine job:wait
Upstream-commit: a74be95b2397a17d2bf9683e011cb9f8f953fb4b
Component: engine
2013-12-09 16:36:23 -08:00
86975238fd
Merge pull request #3109 from artagnon/arch-install
...
Update Arch installation doc
Upstream-commit: b7bc80cba90ecfe75cd621f3d437e63e3ec3fd5d
Component: engine
2013-12-09 15:52:54 -08:00
6865b89ad2
Merge pull request #3104 from jamtur01/uses
...
Added section on Trusted Builds
Upstream-commit: 864729b96fbf3fa912d2686df79ec9baf15af856
Component: engine
2013-12-09 15:51:52 -08:00
009a1fe4fc
Merge pull request #3143 from idupree/patch-1
...
Make it extra clear that the `docker` group is root-equivalent.
Upstream-commit: a67571668e7b95fc21c0a5dea1eccc83af3db7f6
Component: engine
2013-12-09 15:48:05 -08:00
c1707e6dae
Merge pull request #3114 from shykes/hack-stats
...
Hack: stats.sh prints useful project stats for maintainers
Upstream-commit: 75bd5bea70b6a834657454db7b1001561c81bec9
Component: engine
2013-12-09 10:36:17 -08:00
86c7a0eff5
Make it extra clear that the docker group is root-equivalent.
...
Upstream-commit: e2ee5c71fc665170db6a3a487aebb4d7f42eed0b
Component: engine
2013-12-09 12:25:20 -05:00
1e448fb4ac
remove vendored dotcloud/tar
...
The tar dependency has been removed. It's
time to remove the vendored tar as well.
Upstream-commit: 8ec96c9605b1e97fb36f3c2a2d85632f62fb047b
Component: engine
2013-12-09 00:02:13 +02:00
dd4af9a43c
Added section on Trusted Builds
...
Upstream-commit: c094807a1b8159bf237091ecc85fcbd6e2092a3e
Component: engine
2013-12-08 15:54:12 -05:00
23da3f2ced
archlinux installation doc: correct some details
...
1. The AUR package is called docker-git, not lxc-docker-git.
2. According to the official community package, docker depends on
sqlite.
3. 02ef8ec (Update archlinux.rst as packages have changed, 2013-12-06)
updated the installation instructions, but left behind residual
wording about the AUR package not being officially supported; the
community repository is officially supported.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com >
Upstream-commit: f832b76bdfafe3108af61d00171567da02482222
Component: engine
2013-12-08 15:36:02 +05:30
707fb0bfad
Port 'docker version' to the engine API
...
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
d8d9197f34
Cleanup version introspection
...
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
Upstream-commit: 869a11bc93c4b5dc9dbd74d65e69045f367bdb36
Component: engine
2013-12-08 07:35:24 +00:00
012c10845d
Engine: convenience http transport for simple remote job execution
...
Upstream-commit: f80681815422865fbe0e9b637f38553fa965004a
Component: engine
2013-12-08 07:33:23 +00:00
64bd8b9483
Engine: Output.AddEnv decodes structured data from the standard output of a job
...
Upstream-commit: a7a171b6c2916b7be3fa51c9465516acb68c3e32
Component: engine
2013-12-08 06:16:10 +00:00
bb99db485b
Engine: break out Env utilities into their own type - Env
...
Upstream-commit: a80c059baeff0b7d563499e963059a183c7e1bd9
Component: engine
2013-12-08 06:06:05 +00:00
528954d272
Hack: stats.sh prints useful project stats for maintainers
...
Upstream-commit: edace08327675967700a5ff8093ee3104a91772f
Component: engine
2013-12-08 01:47:03 +00:00
34b1795f6e
Engine: 'export' returns a raw archive of a container's filesystem
...
Upstream-commit: 9656cdf0c248fda629fe9f13cf4ce4d3fabd35a4
Component: engine
2013-12-08 01:33:37 +00:00
6e1bef0570
Engine: don't log job stdout to engine stdout (it might be non-text output, for example tar data for 'export'
...
Upstream-commit: 50f3a696bdfde5aed8f020fbac24af4c6c653ca9
Component: engine
2013-12-08 01:33:05 +00: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
d007e15eed
New engine command: 'wait'
...
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
2013-12-06 23:05:21 +00: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
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
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
