Commit Graph

760 Commits

Author SHA1 Message Date
Victor Vieux 7822beced6 update commands.go
update docker.go

move to pkg

update docs

update name and copyright

change --sinceId to --since-id, update completion and docs

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
2014-01-17 17:33:15 -08:00
Michael Crosby 83517b0f69 Replace creating buffer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 95df957f73f4e7bb7225111bd4a4b4ff337af529
Component: engine
2014-01-17 11:02:44 -08:00
Michael Crosby 38c89dc581 Stream the cp operation on the client
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fdd8d4b7d9dbc32a76a708d0d51c201cf9c977f0
Component: engine
2014-01-17 10:51:29 -08:00
Victor Vieux ec9f60e58d move changes to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 90ec5de430a79ab6b145899a9842c1db968341cf
Component: engine
2014-01-15 17:13:45 -08:00
Victor Vieux d902ac68ad move search to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 1669b802cc3e7ce30f05e61630542c88696bbca1
Component: engine
2014-01-15 17:12:48 -08:00
Victor Vieux 9af93e62a4 move history to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bea6dd3888adefd070544241177860864f62fb25
Component: engine
2014-01-14 10:52:42 -08:00
Victor Vieux 1ccf04f8d4 Add compat 1.8
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3a610f754f425ea6042c3f8b5452273656a06c90
Component: engine
2014-01-13 15:50:20 -08:00
Michael Crosby 512d7502bb Remove volumes on docker run -rm
If we don't care about the container then we don't care about any
volumes created with the run of that container

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 14acf6883db8069a10a727ed26f7ef801f460353
Component: engine
2014-01-09 09:58:40 -08:00
Guillaume J. Charmes b1d3493775 Merge pull request #3464 from vieux/fix_error_wait
fix error on docker wait
Upstream-commit: 1d0d093d0b24ab3119a3b727f3c6aeffcf82a9bf
Component: engine
2014-01-08 15:06:54 -08:00
Victor Vieux a94fa6d2ee Merge pull request #3384 from tianon/fix-load-help
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
Upstream-commit: a86a82cb7e6159fc48c40b6e07e63c911100801c
Component: engine
2014-01-06 13:30:16 -08:00
Victor Vieux 426d639912 fix error on docker wait
Upstream-commit: 82531f71681c9b5bc5a6c871f81ef67f9e92d708
Component: engine
2014-01-06 11:11:04 -08:00
Christopher Rigor 9d009d4705 Fix login message to say pull instead of push.
Upstream-commit: 599009191a6d9aa157de10c296909829b93bc00e
Component: engine
2014-01-05 17:07:16 +08:00
Tianon Gravi c4d7d823e4 Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
Fixes #3383
Upstream-commit: 83d631b6a455d3041b7cb31e1c7eb45a16715c43
Component: engine
2013-12-29 13:25:57 -07:00
Guillaume J. Charmes 63c010af99 Exit with code 1 in case of error for docker build
Upstream-commit: 4986958e7e61bb0439a59c46af000b157798b94a
Component: engine
2013-12-26 17:49:41 -08:00
Solomon Hykes a481c1b450 Move utility package 'term' to pkg/term
Upstream-commit: 7ce7516c12f58aa71cd055b7c0bef6585d3f2ab3
Component: engine
2013-12-23 23:42:37 +00:00
Guillaume J. Charmes cf1704f27a Merge pull request #3064 from tianon/custom-dockerinit-path
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
2013-12-19 14:31:41 -08:00
Jesse Dubay 5fd54c24bc Use box-drawing characters in docker images -tree
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...

Before:

    └─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
      |─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
      | └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
      |   └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)

After:

    └─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
      ├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
      │ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
      │   └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
Upstream-commit: d14c162fd621da809baa48e8af007443c4f2ae0a
Component: engine
2013-12-18 22:30:21 -08:00
Victor Vieux a1f6c20284 prevent a panic with docker run -v /
Upstream-commit: 536da93380f1cacb82c344ad09c2daaae29f8ac3
Component: engine
2013-12-18 13:57:49 -08:00
Tianon Gravi c79738b3bc Add dockerinit SHA1 and path to "docker info" when debug mode is enabled
Upstream-commit: f02d766f9a93bf86c6473eb2772bc239ffaa1cd6
Component: engine
2013-12-16 22:29:05 -07:00
Guillaume J. Charmes e18bf01fe0 Merge pull request #3099 from vieux/fix_pull_build
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
Victor Vieux 3e3c1af9cc add GetenvInt64 ans SetenvInt64
Upstream-commit: 85b9338205da0c8f1d62f277db342cf4b9feaf13
Component: engine
2013-12-13 16:29:22 -08:00
Victor Vieux 77daf141f4 move docker info to the job api
Upstream-commit: 51e2c1794b50295607c6eddb29edf39d40816a88
Component: engine
2013-12-13 16:15:15 -08:00
Guillaume J. Charmes 8ac6f87f86 Merge pull request #3145 from vieux/fix_docker_images
multiple fixed in docker images
Upstream-commit: 5b33ae5971ae1071ba377ec1761956a05bf7b21e
Component: engine
2013-12-12 11:17:19 -08:00
Victor Vieux 4ef02ca4a1 fix size in -tree
Upstream-commit: c618a906a4a50b4cc76e9230f971d737a59b8c27
Component: engine
2013-12-09 17:27:05 -08:00
Victor Vieux af25bb8dd1 fix docker images -tree <invalid_image> and docker images -viz <image_name>
Upstream-commit: ac1093b83aee38243b0d6df3dd8aabc52062b9d2
Component: engine
2013-12-09 16:58:17 -08:00
Solomon Hykes 707fb0bfad Port 'docker version' to the engine API
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
Victor Vieux e34a28d653 added authConfig to docker build
Upstream-commit: 228091c79ed043d1896afb04cd0573ee972c2607
Component: engine
2013-12-06 14:27:10 -08:00
Victor Vieux d92518e8b2 fix jsonmessage in build
Upstream-commit: 05f416d869777aa613a5a197ad287c18b77366d3
Component: engine
2013-12-06 14:09:27 -08:00
Michael Crosby 18b9488ee1 Save layersize on pull
Do not display size and virtual size on the cli.
Only display virtual size on the cli
Upstream-commit: 697707e4afe6f1e7e5e33c24ada2f1f2af279142
Component: engine
2013-12-05 14:03:23 -08:00
Victor Vieux e215a324cf fix docker run -a stderr
Upstream-commit: 3ba279a3705b3417fea36e8d2eb7d54e95d60fad
Component: engine
2013-12-04 17:08:14 -08:00
Victor Vieux 9d4980d1a7 Merge pull request #2999 from dotcloud/improve_progress_bars
Handle small screens
Upstream-commit: f8176de191aa4dff9277ae8a2a08d738932fca73
Component: engine
2013-12-03 14:24:40 -08:00
Victor Vieux 71ac3b3d2a Handle small screens
Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb
Component: engine
2013-12-03 14:21:33 -08:00
Silas Sewell d385113417 Rename logs -stream to logs -f
Upstream-commit: b699aee91f90b8390dfa6e8ef58e983fc8c4f3e5
Component: engine
2013-12-03 20:35:22 +00:00
Silas Sewell edb20bb130 Only stream logs when container is running
Upstream-commit: 3ddbb36a84d5530b1f6b496ff8d79ade6f539267
Component: engine
2013-12-03 07:17:07 +00:00
Silas Sewell 1b165a51bf Add stream flag to logs command
Upstream-commit: 62263967b91ca841c43b980aec0ebc74ab2d838d
Component: engine
2013-12-03 06:18:01 +00:00
Victor Vieux 349763ab43 Merge pull request #2998 from creack/fix_json_display
Fix json display
Upstream-commit: 8afb0abbee0ff135a5314d7078285378b8f49c93
Component: engine
2013-12-02 12:58:58 -08:00
Victor Vieux 1528c85fe3 Merge pull request #2965 from crosbymichael/no-private-port
Only return published ports for docker port
Upstream-commit: 62f0e5aef9726761cde5bc73abdf7c318102203e
Component: engine
2013-12-02 12:18:47 -08:00
Guillaume J. Charmes 134dbf8c6a Fix displayJson behavior (dont add newline)
Upstream-commit: 6ea3b9651b3793e31a320926472ff23383a7b915
Component: engine
2013-12-02 11:47:13 -08:00
Dustin Sallings c86bbee38a Add -format to 'docker inspect'
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.

dotcloud/docker#734
Upstream-commit: 9837ad8e9b96b118e8d004e773a05ff9dd208b48
Component: engine
2013-12-02 11:07:41 -08:00
Victor Vieux 128e1b30b4 Merge pull request #2728 from SvenDowideit/docker-import-doc
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Upstream-commit: 4b35c1b6a6167a0dce11cd748c94598199dce942
Component: engine
2013-12-02 10:59:15 -08:00
Michael Crosby 26b3fb6752 Merge pull request #2829 from dotcloud/refactor_opts
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
2013-12-02 10:41:30 -08:00
Michael Crosby 92e4ac1dc3 Merge pull request #2945 from dotcloud/refactor_stream
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
2013-12-02 10:31:09 -08:00
Guillaume J. Charmes f91ba66458 Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
check on the client side that there is a Dockerfile
Upstream-commit: 5f2313aad396a7cf5750fd5c13236bc5b81b8026
Component: engine
2013-12-02 09:35:31 -08:00
Johannes 'fish' Ziemke 85e4b81e0c Make docker build return exit code of build step
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
Sven Dowideit 66b887f55d check on the client side that there is a Dockerfile, so we don't upload a huge stack of files, only to realise we can't do anything
Upstream-commit: 26cf8b9aff1cffa7c3e3ae7e720c960ff545ee78
Component: engine
2013-12-02 15:55:08 +10:00
Guillaume J. Charmes 2c50a80ad5 Merge pull request #2926 from crosbymichael/attach-wait
Return process exit code for attach
Upstream-commit: 62b1faf28c25a678a50f59251cccd2316239cc4a
Component: engine
2013-11-29 18:49:24 -08:00
Michael Crosby 5658618c30 Only return published ports for docker port
Upstream-commit: 65db62619c8ae61c9735cb2a433adac7731256a5
Component: engine
2013-11-29 16:45:20 -08:00
Guillaume J. Charmes a0f64049ec Merge branch 'master' into fix_tests
Upstream-commit: bb284ce59d661d9ec6e8dc9fd5b8fe21b588484b
Component: engine
2013-11-29 13:17:36 -08:00
Guillaume J. Charmes 27de84e1e0 Make sure the termcaps are restored after hijack
Upstream-commit: c13821ad0bfa596a8bbc06a494500ee39a35e429
Component: engine
2013-11-29 09:55:15 -08:00
Guillaume J. Charmes 4a151bb6e6 Actually test the detach (was not the case before)
Upstream-commit: 63d6cbe3e4d6f29c2491b0f1f505ef79b7191d8e
Component: engine
2013-11-29 09:11:20 -08:00