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
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
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
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
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
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
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
cdeb24fafc
Packaging|dockerbuilder, issue #761 : use docker-golang PPA. Add Dockerfile header
...
Upstream-commit: bd9bf9b646837dac5f935e43a4b950d42353676e
Component: engine
2013-06-17 14:08:50 -07:00
e99de544ce
Merge pull request #912 from dotcloud/bump_0.4.1
...
Bumped version to 0.4.1
Upstream-commit: 7b6f50772cc7003fede23e74f70f8dc76b96a434
Component: engine
2013-06-17 14:06:17 -07:00
569fd3d92a
Merge pull request #911 from dotcloud/add_port_redirection_doc
...
* Documentation: add port redirection doc
Upstream-commit: 6e2c32eb9a86c65c55d9097e58a5ad5c9a950e66
Component: engine
2013-06-17 13:57:08 -07:00
fe13f8b67b
Merge pull request #897 from dotcloud/fix-overlapping-add
...
* Builder: ADD improvements: use tar for copy + automatically unpack local archives
Upstream-commit: 22b0a38df51acd9f96ae1a82f8a5b86640b5f3b5
Component: engine
2013-06-17 13:32:34 -07:00
00898589d5
Typo
...
Upstream-commit: cb58e63fc54fb3f1c620c8372269a8e308e43bee
Component: engine
2013-06-17 14:28:04 -06:00
cafa9cc449
Added content to port redirect doc
...
Upstream-commit: 862659875335c953bf6974af4cace397c7ec3902
Component: engine
2013-06-17 13:25:50 -07:00
5e2d23d571
add port redirection doc
...
Upstream-commit: 36231345f17e6fdb08b0f756c4872294d4745048
Component: engine
2013-06-17 22:05:58 +02:00
434fb6f49b
Bumped version to 0.4.1
...
Upstream-commit: e8f001d45157f2f645e415543d7c3e7bf832c665
Component: engine
2013-06-17 19:15:21 +00:00
21a945c9c4
Merge pull request #887 from dotcloud/761-packaging-dockerbuilder
...
Packaging, dockerbuilder: Automate pushing docker binary packages
Upstream-commit: 389db5f5987e927bf2f8f90ea536fec3a95ac1cb
Component: engine
2013-06-17 08:40:01 -07:00
4015efd9be
FIXMEs
...
Upstream-commit: 6746c385bd7938e1bbcf588a27651de63a2de04a
Component: engine
2013-06-15 12:24:20 -07:00
1cdf6869a0
Merge pull request #895 from dotcloud/build-fixes
...
- Builder: fix a bug which caused builds to fail if ADD was the first command
Upstream-commit: 30f604517a5ddc15b3e9f6e9d42f4c7569c1627f
Component: engine
2013-06-15 09:23:41 -07:00
8e1839cf72
Fix a bug which caused builds to fail if ADD was the first command
...
Upstream-commit: 080f35fe65a7bb88ccf2abefa985c7a4ae88a47b
Component: engine
2013-06-15 09:16:35 -07:00
2105eec29d
+ Builder: ADD of a local file will detect tar archives and unpack them
...
into the container instead of copying them as a regular file.
* Builder: ADD uses tar/untar for copies instead of calling 'cp -ar'.
This is more consistent, reduces the number of dependencies, and
fixe #896 .
Upstream-commit: 5b8287617de65d4e14ed6affb0eb46867e9ee617
Component: engine
2013-06-14 16:43:39 -07:00
f839c4752b
FIXMEs
...
Upstream-commit: 5799806414b266c14a8ea2802cfa0906d920c62d
Component: engine
2013-06-14 16:29:19 -07:00
3562ef766f
Various FIXME items
...
Upstream-commit: 14265d9a18a4a2151bfd4e5c7e94de45377b6375
Component: engine
2013-06-14 15:11:34 -07:00
158248b9fd
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 17235eb0893fc7f8658ed36da0ec336b2d1fca5d
Component: engine
2013-06-14 15:07:05 -07:00
40bdb17b30
Remove duplicate 'WARNING'
...
Upstream-commit: 7f118519eb007b2423fff428aceddabd6c1c301d
Component: engine
2013-06-14 14:46:08 -07:00
54b69da177
Merge branch 'dns_server_side'
...
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
Upstream-commit: 250e47e2eb12015fd436a9b695c50cc2fbfb3fdc
Component: engine
2013-06-14 14:39:05 -07:00
280d969b39
Merge pull request #857 from edx/856-vagrant-port-forwarding
...
* Vagrantfile: Add an option to forward all ports to the vagrant host that have been ex...
Upstream-commit: f413fb8e56ae42a762222ddcf402cbaf89878e2e
Component: engine
2013-06-14 14:37:55 -07:00
974c66090e
Merge pull request #607 from dotcloud/expose_api_port_vagrant-feature
...
* Vagrantfile: Add the rest api port to vagrantfile's port_forward
Upstream-commit: f0e43dcdb15a160991b923f8f0ad76929e8b1c04
Component: engine
2013-06-14 14:35:53 -07:00
