e55048dc4d
gofmt and test sub directories in makefile
...
Upstream-commit: 5dcab2d361956e75d00d5bee18371395f17a663f
Component: engine
2013-06-19 14:50:58 +00: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
901aace697
Merge branch 'master' into add_unix_socket-feature
...
Upstream-commit: d52af3f58f26c1bf1ea61af532385965434373eb
Component: engine
2013-06-19 12:49:27 +00:00
bdd6ad8a7a
update docs
...
Upstream-commit: 063c838c927615e9507eca2a5c2f38a5fc4c35b2
Component: engine
2013-06-19 12:48:50 +00:00
8ec498cc12
add tests
...
Upstream-commit: 9632bf228744dddfae2c303a0f2e8b962b6e0673
Component: engine
2013-06-19 12:40:01 +00:00
cbe318e165
add the possibility to use multiple -H
...
Upstream-commit: dede1585ee00f957e153691c464aab293c2dc469
Component: engine
2013-06-19 12:31:54 +00: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
8a4b4e8c79
Added multilayer example image.
...
Upstream-commit: 5183399f50e489204471393c4e89a0476f396b9b
Component: engine
2013-06-18 19:31:35 -07:00
eb5b208b24
New Terminology section and illustrations.
...
Upstream-commit: a780b7c6b53fc15ef884def8696ac29f961acb2c
Component: engine
2013-06-18 19:31:35 -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
9ed8c4d64b
Merge branch 'master' into fix_detach_eof
...
Conflicts:
commands.go
Upstream-commit: c063fc02387b232bff4720a7c8aab5f799f4a073
Component: engine
2013-06-18 17:15:31 -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
dc08f9942c
remove offline mode from auth unit tests
...
Upstream-commit: 6dccdd657f715c164f2fe6fc786c8274a2425f1b
Component: engine
2013-06-18 17:09:47 -07:00
61d11ddffb
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -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
0c8eff63fa
Update documentaiton
...
Upstream-commit: 84ceeaa8708293de81765a0f854952a74d191024
Component: engine
2013-06-18 14:36:35 -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
017e4a61cb
Fix merge issue
...
Upstream-commit: 6e17cc45eabf6d094241fc3e017a90da8ba6f5d9
Component: engine
2013-06-18 12:33:06 -07:00
4ff35be219
Nicer output for 'docker build'
...
Upstream-commit: cb9d0fd3bc13a381f3017d06cd057da2cd3f1c15
Component: engine
2013-06-18 12:26:56 -07:00
11334d506a
add basic support for unix sockets
...
Upstream-commit: 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Component: engine
2013-06-18 18:59:56 +00: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
ec13f22dbd
Remove useless goroutine
...
Upstream-commit: 3dc93e390ad3d310dede84948b726ce67e261375
Component: engine
2013-06-18 10:10:03 -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
8dbff8be16
Merge pull request #920 from dotcloud/919-packaging
...
Packaging, issue 919: Bump version to 0.4.2
Upstream-commit: 2e7649beda7c820793bd46766cbc2cfeace7b168
Component: engine
2013-06-18 01:08:03 -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
91e6023ad7
fix missing command in irc bouncer example
...
Upstream-commit: 2626d88a21f639913f7f8e8b0719fd9e07cfbed4
Component: engine
2013-06-17 14:50:58 -07:00
74ed6f1501
- Runtime: Fixes #884 enforce stdout/err sync by merging the stream
...
Upstream-commit: 3a0ffbc77267e395676860db265ee3476c45b3c2
Component: engine
2013-06-17 14:44:35 -07:00
