Commit Graph

237 Commits

Author SHA1 Message Date
8990ed16c8 Add *.orig to .gitignore
Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459
Component: engine
2013-03-12 08:06:22 -07:00
ee6bd4ea31 Merge branch 'fs' of https://github.com/dotcloud/docker into fs
Upstream-commit: d24ce7dfd15b049560f5d06d57c2b7e2c6a5d61a
Component: engine
2013-03-12 05:37:07 -07:00
422044f5c5 'docker run' works with paths as well as image IDs
Upstream-commit: de50c9c4e8d0276890cfb521e5b57da58cf470aa
Component: engine
2013-03-12 05:57:19 -07:00
22687838eb gofmt
Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08
Component: engine
2013-03-12 05:36:37 -07:00
090804e18e Add TestCommitRun unit test
Upstream-commit: f2dc079c05c073d63b10a3c2a2bc784d1e94e82c
Component: engine
2013-03-12 05:35:47 -07:00
7cb2cc835d Add parent when needed on store.Create, fix the mountpoint on store.layer.
Upstream-commit: 2664668388bd2b1d7012b863d4f8d426fda17daf
Component: engine
2013-03-12 05:23:13 -07:00
b9140244d5 Put back the relative paths for dev purpose
Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266
Component: engine
2013-03-12 05:17:51 -07:00
82c8224ed4 Merge branch 'fs' of github.com:dotcloud/docker into fs
Upstream-commit: 8158616d6133bbe71ad33b4a2be06664e038b8d0
Component: engine
2013-03-12 04:29:06 -07:00
e1030605a9 Re-enabled cat, write and ls ; Added creation date to image metadata
Upstream-commit: 63dd8f101816c1253ac8d05e10f4f8a4c80f296a
Component: engine
2013-03-12 04:24:26 -07:00
aee1baf2e0 Add "nuke" function to docker tests to avoid disk space waste
Upstream-commit: e0b09d4933a289da01508039995bd627ff1392df
Component: engine
2013-03-12 00:08:41 -07:00
c1226e5612 Replaced 'pull' and 'put' with 'import'
Upstream-commit: 132ecb24822072c82718d47ac23da62a8ea774fc
Component: engine
2013-03-11 21:04:16 -07:00
a52c532fef Fix a bug which caused dockerd to crash at startup if a container didn't have a registered mountpoint
Upstream-commit: 2548722dae1be15c61ee8db1a5eaa1d04ba7fcef
Component: engine
2013-03-11 17:05:01 -07:00
3720d832c1 post-merge repairs
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
7c2c4d6c33 Merged upstream changes in fs branch
Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2
Component: engine
2013-03-11 05:50:09 -07:00
347532ed43 Merged master branch into fs
Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364
Component: engine
2013-03-11 05:42:36 -07:00
c28aedcbf3 Change relative paths to absolute
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
fae9969603 Removed deprecated docker/image package
Upstream-commit: dd0227b700503e03fce0e9e9ea3539c438e9c0cb
Component: engine
2013-03-09 20:17:31 -08:00
c015b59ef3 Fixed a bug which caused dockerd to not create its DB if an empty /var/lib/docker/images existed; fixed a bug which caused dockerd to not create missing tables in the images DB.
Upstream-commit: b5b2f005eb679d0224db407ad1e9320be361640a
Component: engine
2013-03-09 19:56:33 -08:00
f836da6c3f Fixed a bug which caused docker to crash at startup while restoring existing containers
Upstream-commit: 4474cd5677751ee5acac0525953eea583f797a1b
Component: engine
2013-03-09 19:49:09 -08:00
279f7946e3 gofmt
Upstream-commit: c59fff422fdc61c1c994b44fd83e4173a2f0530a
Component: engine
2013-03-09 19:44:09 -08:00
44192a1329 Plugged in image store in front-end (some commands are deactivated right now, will progressively reintroduce them
Upstream-commit: 93ba6dd82bb62dbb9cac729cfa6626c469a87d00
Component: engine
2013-03-08 10:48:22 -08:00
5aae786a89 Setup a predictable, repeatable environment for containers
Upstream-commit: fb350e0c7705850cc78e1dc1dc63b56aca06c3cc
Component: engine
2013-03-07 09:25:41 -08:00
4ec7273fca Container logs are persisted on disk
Upstream-commit: 2df0bc6bc0df53c7657404a92fb8f256b7109de0
Component: engine
2013-03-06 16:08:44 -08:00
4f3545b3a6 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 007c57deba0d2ceb1fe6bcf90fd7621e79855651
Component: engine
2013-03-06 00:39:35 -08:00
35ee9964bb docker port: lookup public-facing tcp ports for a container
Upstream-commit: 410ebe379dbf60d8fd75ba695e4e8036fdba6b65
Component: engine
2013-03-06 00:39:03 -08:00
9e8c334ba7 Remove leftover debug message
Upstream-commit: 791592731eccfae0072b20a80d15ec31e34dc88f
Component: engine
2013-03-06 00:37:00 -08:00
664b07c397 Moved Vagrant guide to the wiki
Trying to keep the authoritative docs very small, so we can keep it correct and up-to-date.
Upstream-commit: 836e7b2881b9257ecb31fc3bbd696af84e17730d
Component: engine
2013-03-05 22:44:09 -08:00
c114400a94 docker rmi -r: remove all images matching a regexp
Upstream-commit: 74c88fdbc0180c276f75322066e7da2e3cd38f6d
Component: engine
2013-03-05 22:39:43 -08:00
fe79db830e Reorganized README
Moved Install instructions closer to the top.
Upstream-commit: 711e29fb9b56e9583f9a2730d4d5db21e9cd2105
Component: engine
2013-03-05 16:00:17 -08:00
9cfa2c197b Updated README: networking no longer "coming soon"
Upstream-commit: 9f3b1a8ee05852fe41ddfba2b4765656d3e54805
Component: engine
2013-03-05 15:58:27 -08:00
ee6308efa8 Updated install instructions and download links
- New binary download links
- Fixed incorrect install instructions
- Merged client and host install instructions
Upstream-commit: d372dacbc9f4caf9743fe6c67c84c1e273faa663
Component: engine
2013-03-01 17:21:26 -08:00
b8e54f45cd Re-enabled CmdPull progress bar code which had been temporarily disabled
Upstream-commit: 5675439b9100b40529b8eb87447231a2f5a01ad2
Component: engine
2013-02-28 16:30:31 -08:00
ba5971c0a7 Re-enabled lxc capabilities drop
Upstream-commit: 2192d3371ceb7431a6dacd170ddadd4ef26d5783
Component: engine
2013-02-28 11:57:57 -08:00
7bb4e569d5 Merge branch 'master' into networking
Upstream-commit: f62344b75053fbfaf66246c2cb3e20577e317ce4
Component: engine
2013-02-28 11:52:52 -08:00
db9b80be91 Server: -p option to export TCP ports
Upstream-commit: f857fa0dddbf48b959b0876582027ebc46dc5e9e
Component: engine
2013-02-28 11:52:22 -08:00
524643db0f Docker: Network manager integration
Upstream-commit: bd2f51290f4c34daec08474c0bd78952030be6ff
Component: engine
2013-02-28 11:52:07 -08:00
65fd63e26d Container can now take a list of ports to expose in its config
Upstream-commit: 09eacdfadec36f79cec74f037484b10ddfae6791
Component: engine
2013-02-28 11:51:14 -08:00
3cddff121d Network: Port mapping support.
Implemented a port allocator and a port mapper that is able to forward TCP ports
from the host to the container.
Upstream-commit: 799ffa176399877e610ff2049dbf84610037a2be
Component: engine
2013-02-28 11:50:02 -08:00
58a8b7bd53 Update puppet/modules/docker/manifests/init.pp
Add required bsdtar dependency
Upstream-commit: ed85cb6508854f6d12d43e8a88a8c728bc633c3c
Component: engine
2013-02-26 18:17:51 -08:00
9a491da582 Merge branch 'master' into fs
Upstream-commit: ffbb9c8e4a1b7c98bbb602a8428376e4a41214d3
Component: engine
2013-02-26 17:45:55 -08:00
4c53a7568f Halfway through fs branch fixes, TestUser not passing
Upstream-commit: 2ebf3464a1ed5bf32e33eff45cfa8e8394b5cd43
Component: engine
2013-02-26 17:45:46 -08:00
a736616ad1 Merge from master
Upstream-commit: c7f4602b184ec2cab594dfeaf73bed09aa39a749
Component: engine
2013-02-26 17:32:07 -08:00
b9049f5277 Changed .gitignore to not match docker/*.go
Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a
Component: engine
2013-02-26 17:29:11 -08:00
ee05cc5bbc If curl is installed, 'docker pull' will use it to download images with a pretty progress bar. Otherwise it will fallback to regular http.Get()
Upstream-commit: 003ec21d360b08d50b61834795692542fff295e2
Component: engine
2013-02-26 17:28:24 -08:00
d2bed9b75c go fmt
Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9
Component: engine
2013-02-26 17:26:46 -08:00
9ff14257ee Updated pybuilder example to use 'docker wait'
Upstream-commit: 4004e86fa9ca87332c8f5fa0acbe29af86e06908
Component: engine
2013-02-26 14:47:20 -08:00
3caf4d4dd5 docker wait: block until a container exits, and print its exit code
Upstream-commit: ebaa50c4c96a1ba69e480fab5612b5d6a97da145
Component: engine
2013-02-26 11:43:54 -08:00
4ea244cb65 Merge branch 'master' into networking
Upstream-commit: 3c0a59f03873e5c062ef0d39267341dd5f5e6bca
Component: engine
2013-02-26 11:04:28 -08:00
c483fcc71c Merge branch 'master' into networking
Upstream-commit: 2c2db5cd45f3281954211dc72a4412f5b611ad24
Component: engine
2013-02-26 11:03:11 -08:00
c9db276294 New example: pybuilder
Upstream-commit: 8fa07c0e060a25141204533a2a3823d1cb0fdf63
Component: engine
2013-02-26 10:03:06 -08:00