eb87dc37e0
Merge branch 'master' into simpler-build-upload
...
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
c7b40afdea
Packaging|ubuntu, issue #954 : Generate debian/changelog from main CHANGELOG.md
...
Upstream-commit: 88dcba3482df33f47a0b89c0811a96abf0609840
Component: engine
2013-06-19 16:32:51 -07:00
b84c59c43b
Merge pull request #945 from globalcitizen/master
...
Security warnings in LXC configuration
Upstream-commit: 754609ab697df644b39c557607cff111e91ee495
Component: engine
2013-06-19 15:06:48 -07:00
f576f996f6
* Remote API: updated docs for 1.3
...
Upstream-commit: d6ab71f450ac3673ffd4bc806de23e42a6d32c07
Component: engine
2013-06-19 15:03:33 -07:00
a327fa094d
* Builder: remove duplicate unit test
...
Upstream-commit: 55edbcd02fe5d519069677c3970ea90e9973a4eb
Component: engine
2013-06-19 14:59:42 -07:00
f1b51af018
*Builder: warn pre-1.3 clients that they need to upgrade. This breaks semver, but our API should still be in 0.X versioning, in which case semver allows breaking changes.
...
Upstream-commit: 90dde9beabcac3874a274f9f7952f25ba8c1c7a3
Component: engine
2013-06-19 14:59:28 -07:00
575d367f53
Merge pull request #951 from dotcloud/add-fix
...
* Builder: correct the behavior of ADD when copying directories.
Upstream-commit: 9c8085a0aadcfc21950c234d7f3043807b138bc7
Component: engine
2013-06-19 14:36:09 -07:00
937f62ca0a
* Builder: correct the behavior of ADD when copying directories.
...
Upstream-commit: 507ea757a5d72af47b37af0e384e83fcea613a7b
Component: engine
2013-06-19 14:26:11 -07:00
9b7da2ae1e
Merge pull request #917 from dotcloud/pull_pool
...
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
Upstream-commit: 7e065aaacd35f0db675c4699c846e01314b18765
Component: engine
2013-06-19 14:11:29 -07:00
606a85a77c
Merge pull request #924 from eliasp/remove-ifconfig-usage
...
* Documentation: replace `ifconfig` in docs with `iproute`
Upstream-commit: a056f1deeceac20a9212570ea8448911e3f0d1ed
Component: engine
2013-06-19 13:20:35 -07:00
49aceb894c
Merge pull request #944 from hansent/patch-1
...
* Documentation: use https repo url to clone for dev setup instructions
Upstream-commit: fdaefe6997a0741e37e3a12e3c3c86c33bf22987
Component: engine
2013-06-19 13:17:08 -07:00
e35a6b3cf9
hotfix: nil pointer uppon some registry error
...
Upstream-commit: a7e14a3065ccd97fcd77b4038abdf30bee78a2b4
Component: engine
2013-06-19 11:08:19 -07:00
286eece9f4
Add note about lxc.cap.keep > lxc.cap.drop
...
Upstream-commit: 788d66f409ce3a7e464bbb68d909960648f2515c
Component: engine
2013-06-20 00:39:35 +07:00
903c80e7d6
Add healthy procfs/sysfs warnings
...
Upstream-commit: 96988a37f52b65e8b703b6c2de138c34486215ad
Component: engine
2013-06-20 00:37:08 +07:00
f245288e89
Merge branch 'master' into fix-add-behavior
...
Upstream-commit: b368d21568ae12f7a7b7fe5e0afd0460e2057d78
Component: engine
2013-06-19 10:31:50 -07:00
f5f2d8e1e0
use https repo url to clone for dev setup instructions
...
the git clone line in the dev setup instructions does not work as is, unless the user has write access
Upstream-commit: c88b763e80d6ad0253da060896da10d60f58f829
Component: engine
2013-06-19 11:38:58 -05:00
1644bb786c
Merge pull request #849 from dotcloud/improve_progressbar_pull
...
* Client: HumanReadable ProgressBar sizes in pull
Upstream-commit: ec3c89e57c3e91fabb9b084a2762faa20ca720ec
Component: engine
2013-06-19 08:02:40 -07:00
07744913a6
Merge pull request #930 from andrewmunsell/patch-1
...
Fix Mac OS X installation instructions URL
Upstream-commit: 5f7e98be20e9382b0cae6b89bb7bf57d9e83d6ae
Component: engine
2013-06-19 07:31:24 -07:00
41c1e7ceb7
* Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
...
Upstream-commit: 5be7b9af3ee9b884482220979735e2a8ea969ce3
Component: engine
2013-06-18 20:28:49 -07:00
e0eb4c405e
Merge pull request #788 from samjsharpe/master
...
Vagrantfile: Add support for VMWare Fusion provider
Upstream-commit: 0ae778c8812fa7adfece0dd37ef82d7970431f06
Component: engine
2013-06-18 18:35:25 -07:00
6df91ed398
Fix Mac OS X installation instructions URL
...
Upstream-commit: 1f8b679b18984eeecc98d6de79a77cbd405cd56d
Component: engine
2013-06-18 19:19:07 -06:00
85dd5013c2
Merge pull request #885 from dotcloud/remove_bsdtar
...
* Runtime: Remove bsdtar dependency
Upstream-commit: ee5df765796cfbeade482652e4c5d928c82af6d1
Component: engine
2013-06-18 17:24:26 -07:00
93aacc6be8
Merge branch 'remove_bsdtar' of https://github.com/dotcloud/docker into remove_bsdtar
...
Upstream-commit: b431720dace700bc72b54e92df6824f169cefd53
Component: engine
2013-06-18 17:23:22 -07:00
2d59f452fa
Fix issue within TestDelete. The archive is now consumed by graph functions
...
Upstream-commit: 42ce68894a33a7d966f8dd767aee46dea6dbc346
Component: engine
2013-06-18 17:22:32 -07:00
0d4d92aeeb
Merge pull request #916 from dotcloud/race_attach-fix
...
- Runtime: Fix race condition within Run command when attaching.
Upstream-commit: 0a9ac63a051c1808c7b8ac3ba06ed44e5b86fd4d
Component: engine
2013-06-18 17:13:38 -07:00
65fe379064
Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage.
...
Upstream-commit: bc9b91e501369264966263fc28bb516e6048b7e5
Component: engine
2013-06-19 00:57:43 +02:00
07df046233
Merge pull request #927 from dotcloud/nicer-build-output
...
* Builder: nicer output for 'docker build'
Upstream-commit: edbd3da33a02068cd48d4a862071f429c0d05329
Component: engine
2013-06-18 15:48:00 -07:00
2c3eeb1b3d
Merge pull request #918 from dotcloud/hisotry_lookup
...
Add image lookup to history command
Upstream-commit: 32e8f9beca4c8a0c0b3e32b8d7ea4366067c3913
Component: engine
2013-06-18 15:36:05 -07:00
c061827960
Updated FIXME
...
Upstream-commit: cdeaba2acfe8e5765aaf9fec195705eb841cb857
Component: engine
2013-06-18 13:02:12 -07:00
781a7a3216
Fix incorrect docs for 'docker build'
...
Upstream-commit: c0b82bd807000019674e1f939b9ee2f43e5ba518
Component: engine
2013-06-18 12:52:37 -07:00
f787ba917e
Merge pull request #926 from josephholsten/fix-znc-example
...
- Documentation: fix missing command in irc bouncer example
Upstream-commit: 88e35b6f80977f99f8b65796c2237c66ce0d37b2
Component: engine
2013-06-18 12:37:21 -07:00
4ff35be219
Nicer output for 'docker build'
...
Upstream-commit: cb9d0fd3bc13a381f3017d06cd057da2cd3f1c15
Component: engine
2013-06-18 12:26:56 -07:00
3fe9ccaf5e
Fixed #923 by replacing the usage of 'ifconfig' with 'ip a' where appropriate and added a note to use 'ip a' instead of 'ifconfig' for a screencast transscript.
...
Upstream-commit: c2e95997d4c4dda9edbb4adaab8920f1b5982c25
Component: engine
2013-06-18 19:55:59 +02:00
531f894fab
* API: Send all tags on History API call
...
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
549a47a3dd
Remove bsdtar dependency in various install scripts
...
Upstream-commit: 6f511ac29b1c3cf1c2424b3c39ee14a32aecb5d7
Component: engine
2013-06-18 10:23:45 -07:00
7bd657cfeb
Remove useless goroutine
...
Upstream-commit: e2d034e48858d0afe9ee0f88f04e40cbf95ab8ba
Component: engine
2013-06-18 10:06:26 -07:00
43ecdc208f
Merge branch 'master' into race_attach-fix
...
Upstream-commit: 86205540d8d28e4f070ece91712238212105ddf0
Component: engine
2013-06-18 10:03:34 -07:00
26a92f3da2
Merge pull request #921 from dhrp/docs-redirects-and-fixes
...
Fixes on documentation. LGTM
Upstream-commit: 702c3538a4f9dd251c27364f3511be19851f7784
Component: engine
2013-06-18 09:58:24 -07:00
93d4798beb
Merge pull request #914 from ToothlessGear/fix-version-output
...
* Client: Fix docker version's git commit output
Upstream-commit: 069a7c1e99df6458868c9585aeeb1aaf642160f2
Component: engine
2013-06-18 05:56:42 -07:00
dfa9579ca2
Vagrantfile: Add support for VMWare Fusion provider
...
As a user who has blown $150 on VMWare Fusion and vagrant-vmware, I
would like to use my new shiny to hack on Docker. Docker already has a
multi-provider Vagrantfile, so adding another one presents little risk.
Known Issues:
- The docker install of a new kernel breaks the Vagrant shared folder.
- This seems to be because the VMWare hgfs module doesn't build
against a 3.8 kernel.
- I don't believe that shared folder support is actually in use
Upstream-commit: 8281a0fa1cea0199ab183c0925a41e79a18382dc
Component: engine
2013-06-18 06:19:14 +01:00
c44c8b06a4
Fixed on documentation.
...
* replaced previously removed concepts/containers and concepts/introcution by a redirect
* moved orphan index/varable to workingwiththerepository
* added favicon to the layout.html
* added redirect_home which is a http refresh redirect. It works like a 301 for google
* fixed an issue in the layout that would make it break when on small screens
Upstream-commit: 3491d7d2f11246ba4067708a3c5336ba21da4767
Component: engine
2013-06-17 20:16:56 -07:00
797aaaf7fe
Packaging, issue 919: Bump version to 0.4.2
...
Upstream-commit: e664a46ff334ff9f7c8dfb438e15950e3cacf184
Component: engine
2013-06-17 19:50:31 -07:00
fb46f44c43
* Builder: upload progress bar
...
Fix progress bar
Upstream-commit: 0809f649d356b6b8d34a03bee8447049161ea09c
Component: engine
2013-06-17 18:49:16 -07:00
176d1b39a4
Update documentation
...
Upstream-commit: 02a002d264faa7b8cdf5c68b7370c31d6794a44d
Component: engine
2013-06-17 18:41:13 -07:00
00bc56197b
* API: Add tag lookup to history command. Fixes #882
...
Upstream-commit: 3bfc82257878e55141bb029390574130c3ac0530
Component: engine
2013-06-17 18:39:30 -07:00
b0870dd8c5
Fix bug on compression detection when chunck < 10bytes
...
Upstream-commit: 02c291d13be261f84cdfa1d51513bf4dba31ce72
Component: engine
2013-06-17 18:11:58 -07:00
3c8ee31f8a
fix docker version git output
...
Upstream-commit: b25bcf1a666ebef26e2acfa132fa2b72d47d0805
Component: engine
2013-06-17 23:32:48 +00:00
18c9c45d0a
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
...
Upstream-commit: fe204e6f48eb47a1deb3553003eaf9863a66fd1a
Component: engine
2013-06-17 16:10:00 -07:00
5a843b1afc
Remove Run race condition
...
Upstream-commit: 2b6ca3872883dcb487d8a39a1a8530be6a62f947
Component: engine
2013-06-17 15:45:08 -07:00
fa0630fa0a
Move the attach prevention from server to client
...
Upstream-commit: c106ed32ea7613573a2081d47ad2498429ac86f2
Component: engine
2013-06-17 15:40:04 -07:00
