Commit Graph

415 Commits

Author SHA1 Message Date
84b60cc354 Waiting to start docker until the fresh binaries have been copied in
Upstream-commit: 9542876d2f22e73a52b4957d1a8ca6b17d5c83e7
Component: engine
2013-03-22 08:48:50 -05:00
a6e206cff8 Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 9fa3d891c6ef5b335468268df5ac4be7c569494b
Component: engine
2013-03-22 04:25:37 -07:00
90cf237eab Fixing newlines in attached mode
Upstream-commit: b00ff47963bb236d9f94fbcd759e4f3fba021d05
Component: engine
2013-03-22 04:24:03 -07:00
cc65646965 Merge pull request #128 from cespare/markdown-fixes2
Fix numbering in README markdown.
Upstream-commit: 1850e8d49ca204063ac99cdb634015303a809ac3
Component: engine
2013-03-21 22:46:22 -07:00
f727a9a2e6 Merge pull request #130 from dotcloud/113_vagrant-compat
113 vagrant compat
Upstream-commit: afb4a36ffa0ef00951d827cb0dd0664baa3290ea
Component: engine
2013-03-21 22:44:38 -07:00
9420f9fed2 vagrant; issue #113: normalize whitespaces
Upstream-commit: 45df6f7801554ccb24ba8ccf42ec5a847262b9ca
Component: engine
2013-03-21 22:26:18 -07:00
16a6ba544f vagrant; issue #113: Make Vagrantfile backward compatible with versions < 1.1
Upstream-commit: 6295a022750627d433c5c44872393ede4f1d8051
Component: engine
2013-03-21 22:16:52 -07:00
abeaa1334a create README.md at this place for preview.
Upstream-commit: 13e597a5adf7e700757ee2b8ec40fe6712ebc99e
Component: engine
2013-03-21 21:47:14 -07:00
d273626723 Fix numbering in README markdown.
Upstream-commit: d515e2b06c70a4132343da69a6a763ef626e7376
Component: engine
2013-03-21 21:46:00 -07:00
6b95e26e83 Merge pull request #126 from cespare/markdown-fixes
Markdown fixes in the readme.
Upstream-commit: 41c664cacf3a295b2c0b72a4cc46225617c35893
Component: engine
2013-03-21 18:24:46 -07:00
7461b49082 Markdown fixes in the readme.
Upstream-commit: 7566006d0de5d1da0ea7f0fa906483425391fbf8
Component: engine
2013-03-21 18:20:54 -07:00
64ae26627e When lxcbr0 has several associated IPs, default to first one found
Upstream-commit: 3aefed2dc250bd41502bdaa11624f1f974ed80b6
Component: engine
2013-03-21 09:19:22 -07:00
cb03d9d3f5 Docker currently doesn't support 32-bit hosts. Let's make that clear by failing right away with an informative message
Upstream-commit: f7837599283ff89493d4fcfb7d9a046a7f9dc13b
Component: engine
2013-03-21 02:04:10 -07:00
f6ae897923 Merge pull request #122 from srid/patch-1
remove ! from command line
Upstream-commit: 3e9877a30fdc3ad7139ee0e8f01d74034b69dd56
Component: engine
2013-03-20 23:26:50 -07:00
232f5ef62c remove ! from command line
bash does not like it

```
$ JOB=$(docker run base /bin/sh -c "while true; do echo Hello world!; sleep 1; done")
bash: !: event not found
$
```
Upstream-commit: 3bb176d8ae7f43ab0d1ca8e03b59f2f137f07530
Component: engine
2013-03-20 22:53:42 -07:00
5faab73423 Merge pull request #121 from ezbercih/patch-1
Fix issue #120, initialize TCPAddr w/ field names
Upstream-commit: 3f63e3426e900559e85f7517f1c72f745121cce7
Component: engine
2013-03-20 20:25:16 -07:00
9ee419103c Merge pull request #115 from termie/readme_update
update the dependencies for the dev environment
Upstream-commit: 33d2905cde5fe0745c5aef36e8ee52d35f04ae4b
Component: engine
2013-03-20 15:20:18 -07:00
c23224aff0 update the dev requirements in readme
a little pedantic, perhaps, but on a fresh precise image from vagrant I
still needed these two packages to run the commands following it
Upstream-commit: 2048354c8b72feb35eaa53dcc29e78a111e69cfb
Component: engine
2013-03-20 20:17:46 +00:00
786ef6aa6a Removed 'fake' package.
Upstream-commit: 6d580247c27da7cddcc6a582b846b1e8bd5bc0d6
Component: engine
2013-03-20 07:49:38 -07:00
21dbee3159 Complete pull request #121, init TCPAddr with named field
Upstream-commit: ab99e9252d1d3872b2e04234338ce028b9eb091c
Component: engine
2013-03-20 06:02:25 -07:00
2de0bdf328 Fix issue #120, initialize TCPAddr w/ field names
Current Go tip (+74e65f07a0c8) and likely Go 1.1 does not build docker since net.TCPAddr struct has an additional field now for IPv6:

type TCPAddr struct {
    IP   IP
    Port int
    Zone string // IPv6 scoped addressing zone
}

Initializing the struct with named fields resolves this problem.
Upstream-commit: fac32cda5af7adcf0400f1fd8763764a498149f3
Component: engine
2013-03-21 00:11:16 -03:00
1ede90c17e Merge pull request #114 from jpetazzo/whiteboard20130319
Images & repositories, what they mean, and the protocol to push/pull them
Upstream-commit: a3174fd87454e3c2c66433505e3bc4c9f468fbdb
Component: engine
2013-03-20 00:18:43 -07:00
dfd3b1b7c3 Merge pull request #112 from srid/devenv
instructions to compile docker
Upstream-commit: ddf4c79977c77f56a0bf1c5ca8350eed1a619a4e
Component: engine
2013-03-20 00:08:54 -07:00
20a4d31ad9 add pseudo-spec of images, repositories, push, and pull operations
Upstream-commit: acd51ecea8f5d3c02b00a08176171c59442df8b3
Component: engine
2013-03-19 20:35:14 -07:00
3173c6dc8b instructions to compile docker
Upstream-commit: 4389574aff5abc1dd49313ca5217f81210568ed9
Component: engine
2013-03-19 20:17:32 -07:00
461e1a5b07 Merge pull request #110 from synack/master
Add linux-image-extra instructions to README
Upstream-commit: ff2ae90764ccd562ba3c3943e35b9a66fa405c23
Component: engine
2013-03-19 18:46:28 -07:00
5537bf1f7e Update README.md
Upstream-commit: 2508b5cef9c5609d72ed9f2016d4cd3906429f20
Component: engine
2013-03-19 18:45:11 -07:00
0c37dfb111 Merge pull request #106 from kencochrane/users
change registry address to https from http
Upstream-commit: b1acd0a7b0513b31253195fc94e5d8a92b10ebe6
Component: engine
2013-03-19 17:42:29 -07:00
a3b5b5979f change registry address to https from http
Upstream-commit: 8be58d3a7f6020fe34281dbe27375005e248f0f5
Component: engine
2013-03-19 16:03:17 -07:00
5c00b7d3b2 Merge pull request #102 from fkautz/master
Some minor cleanup of cleanup in Makefile
Upstream-commit: c5051ea0ea506e375a85f66ad5bd0666deabfcc6
Component: engine
2013-03-19 10:07:21 -07:00
56cbe57711 Bumped version to 0.0.3
Upstream-commit: 33c2f07fc7b2d132e1f7cd30a37717ed15c086bd
Component: engine
2013-03-18 00:35:48 -07:00
a7be65df70 Contributing to Docker
Upstream-commit: 1480bff3a9149eb34b64e4f2d7d3a727298c640b
Component: engine
2013-03-17 19:32:06 -07:00
9c82c0dd2d Moved Ubuntu install to the top
Upstream-commit: ac7fa37be3ac073f3ecb6df835c32c6dcbe53805
Component: engine
2013-03-17 19:10:47 -07:00
6060102aff Docker: the Linux container runtime
Upstream-commit: 065eca9d4e4dd145b070786e4b497512bd659b58
Component: engine
2013-03-17 19:09:51 -07:00
f29884b197 Adding clean to beginning of all for cleaner builds.
Upstream-commit: 6316b995564f1ffcd614402489ed4b929ac26f74
Component: engine
2013-03-17 11:59:59 -07:00
114ab0aeec Adding bin to clean
Upstream-commit: bb9ce6b2872b62b444306c53d0fa26d389d9a9d9
Component: engine
2013-03-17 11:54:05 -07:00
328d42c651 Makefile cleanup renamed to clean to match standard conventions.
Upstream-commit: a3ca3e921802b1979c14174c352320e45b3251e6
Component: engine
2013-03-17 11:53:37 -07:00
b86522f19c Removed out-of-date examples directory (see README and the wiki for examples)
Upstream-commit: a030c1bd2465b636bb08e85d4f9911f44076612f
Component: engine
2013-03-16 18:36:52 -07:00
c073c8381c Removed redundant file used by debian packaging
Upstream-commit: 4a1c40364c9c93d1168a159fefad1566f31e02cd
Component: engine
2013-03-16 18:35:43 -07:00
9eb43bda41 Merge pull request #101 from silas/examples
Fix docker run typo
Upstream-commit: 4015f8dd34ebf860560e94ec78930a1319bc128f
Component: engine
2013-03-16 18:32:26 -07:00
329be44b1c Fix docker run typo
Upstream-commit: 16f132b156f7d6827fbd0b43364661f0dea7497a
Component: engine
2013-03-16 16:16:13 -04:00
8c166ebfd2 Merge pull request #100 from silas/readme
Fix coffee typo
Upstream-commit: b400d78b19ee81752680fe0d5d41596bf527b110
Component: engine
2013-03-16 12:35:43 -07:00
7fe15e6eda Fix coffee typo
Upstream-commit: e190c27d10034d4c4ee286839351876bb4ec8dc2
Component: engine
2013-03-16 15:19:58 -04:00
0add032982 Removed unnecessary step in the README
Upstream-commit: da47420af67aa4faab95f3f7e5de8378905ec429
Component: engine
2013-03-16 11:39:49 -07:00
700dcf9da6 Merge pull request #84 from kencochrane/users
added docker login command to login to docker registry
Upstream-commit: b55e461122693a000ce2e06ae5623c7acc607c4a
Component: engine
2013-03-16 02:14:07 -07:00
b985acb966 added better error message
Upstream-commit: c4640689affc84c5a975059c5fca27a8b22bd1d0
Component: engine
2013-03-15 15:04:36 -07:00
2eb625d9e0 fixed missing varible, error:
Upstream-commit: 27ad71e025538b903a3eac8ac1e4eea654346b4d
Component: engine
2013-03-15 14:48:42 -07:00
a818fa1a95 added more debugging/ error catching
Upstream-commit: 0a35db8fd061247b1db20fde92237f02a4e6882c
Component: engine
2013-03-15 14:41:55 -07:00
5f5944919c Merge branch 'vagrant11-providers' of ssh://github.com/chooper/docker
Upstream-commit: c1c60a2835ce42c701056fc28db5103ea4bfaa42
Component: engine
2013-03-15 14:25:42 -07:00
074ebe7789 Merged branch packaging
Upstream-commit: ad293056302eb3a3cf00cbbfb1fb6efe68fec6a2
Component: engine
2013-03-15 14:20:02 -07:00