Commit Graph

36 Commits

Author SHA1 Message Date
742b0b0edf Fixed a bug which causes 'docker import' to fail silently when bsdtar is not installed
Upstream-commit: a444327ab6c9b568e87ae9b3d4a1b0a0d050f5e2
Component: engine
2013-03-13 21:50:15 -07:00
95a9c207b8 'docker images' lists images in reverse creation order
Upstream-commit: a216712f3c7bab6709fea60b003128079edd1d39
Component: engine
2013-03-13 19:09:19 -07:00
46131cbf3e Cleaned up fs.LayerStore.AddLayer()
Upstream-commit: 1b34630b8c84d50bd859ff8aea435ab26c5d7de6
Component: engine
2013-03-13 14:20:07 -07:00
e233725d69 Merge branch store_register_refactor
Upstream-commit: 68e173ad5095f6a67af7c27d2ad7d5cc535b4062
Component: engine
2013-03-13 14:09:04 -07:00
c688c5a72a changed the fs.store.Register and fs.store.Create, so that it is a little cleaner, and easier to reuse. Also added a unit test
Upstream-commit: f0a65207aba9bf52e169a7ed783fbd946d5a82c0
Component: engine
2013-03-13 13:35:34 -07:00
b90748d032 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: f3d826447d511209746fc901e30ce0d906712598
Component: engine
2013-03-13 13:24:16 -07:00
271123667b 'docker inspect' supports pinned versions again (eg. 'docker inspect PATH:revision')
Upstream-commit: f5f26a510f15d96a320b668e10516bc068905b11
Component: engine
2013-03-13 13:23:59 -07:00
fc32abb2ec Add fixme for the change detection
Upstream-commit: 804abddec155dedc42e99ad746f1cf1fdbfe0fed
Component: engine
2013-03-13 13:03:29 -07:00
06c0237124 Re-enabled docker rmi
Upstream-commit: c3622a963d326df8da8049302e0f2ea4875fc496
Component: engine
2013-03-13 11:14:37 -07:00
b449cc4a56 Merge branch 'master' into 32-aufs_delete_fix
Upstream-commit: 77272bea9c7326e53c625ea22b3676e44abfe271
Component: engine
2013-03-13 01:18:55 -07:00
57f43a3fe4 Fix issue #32, aufs now take into consideration deleted files
Upstream-commit: 7cc512c7c065fe52125fe7d6f045d0248d16de80
Component: engine
2013-03-13 01:17:03 -07:00
35529bba2c Put back the github.com path for the import
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -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
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
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
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
4c53a7568f Halfway through fs branch fixes, TestUser not passing
Upstream-commit: 2ebf3464a1ed5bf32e33eff45cfa8e8394b5cd43
Component: engine
2013-02-26 17:45:46 -08:00
2c9db7d776 Implementing mounting/unmounting of images. Currently missing Mounpoint#Deregister
Upstream-commit: b4ea31e1deb44dc28c75aaaf24ff99c87c7f595a
Component: engine
2013-02-21 23:01:30 -08:00
04d04bc71b Implementing mounting/unmounting of images. Currently missing Mounpoint#Deregister
Upstream-commit: 04bcdf9030123a0d59a930e072429664a0e11194
Component: engine
2013-02-21 23:01:13 -08:00
895d0e934a Better error context when failing to create a new image. Added basic tag support + unit tests
Upstream-commit: 8002af43fb54254ef786e4478ada7824e726baf7
Component: engine
2013-02-18 21:10:19 -08:00
7adde75277 docker/fs: initial support for filesystem layers (adapted from image/layers.go)
Upstream-commit: 6372a1a0d0b6506f25db7ba3dbba1e65fd6deb2d
Component: engine
2013-02-18 15:25:43 -08:00
00d8a73097 Getting started with mountpoints
Upstream-commit: 1531848ca6ead7c46497a625feba1224825e9011
Component: engine
2013-02-15 21:51:36 -08:00
aa0a99f7c1 Fix store.Register()
Upstream-commit: aab32e1012bd6061ec1049adc2bbe60ed1918f54
Component: engine
2013-02-15 21:50:59 -08:00
96bd523083 fs.store.Get(): use gorp.Get() instead of gorp.Select()
Upstream-commit: 07b6bc3fc738ab3a27e9760b0efc57c78d7f98af
Component: engine
2013-02-15 21:48:04 -08:00
56517a2572 docker/fs: a robust filesytem store
Upstream-commit: 902d660d2ff48727386718440162ed2a8399eaf0
Component: engine
2013-02-15 18:46:46 -08:00