Commit Graph

35 Commits

Author SHA1 Message Date
06c0237124 Re-enabled docker rmi
Upstream-commit: c3622a963d326df8da8049302e0f2ea4875fc496
Component: engine
2013-03-13 11:14:37 -07:00
906eecfc45 Merged version option by @kencochrane
Upstream-commit: 070bc0bb6d316a2a023161a19cba667831a26698
Component: engine
2013-03-12 20:59:47 -07:00
9a8e1b4a6b fixed formatting issue
Upstream-commit: e20a74d2477ea3feb7a9734c15b645d081dbebdf
Component: engine
2013-03-12 17:34:15 -07:00
0e7bc1161e Merge pull request #48 from dotcloud/memorylimits
Memorylimits
Upstream-commit: 46dce5918aad5134305d6f1eb6357c822a59bbed
Component: engine
2013-03-12 12:02:49 -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
a130f465ad Fix merge issue
Upstream-commit: d91d0da45310a4ab8d6124b70a1f541352149bdc
Component: engine
2013-03-12 08:59:32 -07:00
d6cad8aba4 Merge master within fs
Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82
Component: engine
2013-03-12 08:33:21 -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
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
c1226e5612 Replaced 'pull' and 'put' with 'import'
Upstream-commit: 132ecb24822072c82718d47ac23da62a8ea774fc
Component: engine
2013-03-11 21:04:16 -07:00
bb9fd12cf7 Added -m to the run command in order to set a memory limit to a container
Upstream-commit: 3684b67572605de492abba041695bd80ef42bcb5
Component: engine
2013-03-11 19:51:24 -07:00
77f5ae75a2 Add all commands to the output of 'dotcloud help'. Fixes #39
Upstream-commit: 52b811f50a0906904d688e5fae8f32e1ada90f1a
Component: engine
2013-03-11 23:11:46 +00:00
3fc19b598b Complete fix for #38 -- fix double-usage on help
Upstream-commit: a7cb3cb86a39f950a517b61e3a674e0cd080804f
Component: engine
2013-03-11 22:29:13 +00:00
dd314eeb8b Fix CmdInspect and CmdImages help/parsing. Fixes #38
Upstream-commit: 06d420d2ead65cb5af760d7946d8844f568f4d65
Component: engine
2013-03-11 22:08:22 +00:00
3720d832c1 post-merge repairs
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -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
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
35ee9964bb docker port: lookup public-facing tcp ports for a container
Upstream-commit: 410ebe379dbf60d8fd75ba695e4e8036fdba6b65
Component: engine
2013-03-06 00:39:03 -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
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
db9b80be91 Server: -p option to export TCP ports
Upstream-commit: f857fa0dddbf48b959b0876582027ebc46dc5e9e
Component: engine
2013-02-28 11:52:22 -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
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
0b5203d2cd 'docker pull' and 'docker put' automatically detect tar compression (gzip, bzip2 or uncompressed). -j and -z flags are no longer required.
Upstream-commit: f437f5b8b4a706d56f9a7cfba1dbc6b21e9a33f3
Component: engine
2013-02-22 12:28:25 -08:00
9f0b4cff0d docker/server: no more dependency on log
Upstream-commit: 004272e6f54c16e16f71ceddff44ae4d423da7c0
Component: engine
2013-02-19 13:07:25 -08:00
e46ebc5e55 dockerd: removed debug messages
Upstream-commit: dd9bb4e0d388788781af0c36dfca0d3792f07d6c
Component: engine
2013-02-19 13:04:19 -08:00
92f2fe8ab7 'docker start' and 'docker restart': start or restart a container
Upstream-commit: d2885910bda77538eb31b86b10a3dd85ee2abadf
Component: engine
2013-02-14 13:49:05 -08:00
d580173852 Server: Restored -u option (from merge)
Upstream-commit: e871eadab16563b4e64ef229c5aeb3cff5b37026
Component: engine
2013-02-13 17:41:50 -08:00
379acaad60 go fmt
Upstream-commit: 2f84bab8797329955e42c3089388c540d8009f04
Component: engine
2013-02-13 17:28:13 -08:00
e924ec5591 Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
Upstream-commit: e1b25e9b084a2375640b811a27b75b89d57666d9
Component: engine
2013-02-13 17:10:00 -08:00