toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,431 Commits 3 Branches 295 Tags
31b43ff70e4fde323653f6bd55e31561697cace9
Commit Graph
2431 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux 31b43ff70e add regression test from @crosbymichael 
Upstream-commit: 2b5386f039b5c99cf0f64fb3091cc14e4446dc64
Component: engine
 2013-07-19 03:01:39 +00:00
Victor Vieux a6f1fb98b1 fix overwrites EXPOSE 
Upstream-commit: a0eec14c7da5b213302c2675801aaf788e84efed
Component: engine
 2013-07-19 02:47:35 +00:00
Guillaume J. Charmes 148c813e5f Merge pull request #1207 from crosbymichael/819-use-persistent-volume 
* Runtime: Do not overwrite container volumes from config
Upstream-commit: d6fb313220c2275c4e76f6191905fb382e54a58d
Component: engine
 2013-07-18 18:51:00 -07:00
Daniel Mizyrycki c1964bd08e Merge pull request #1232 from dotcloud/1217-testing-coverage 
Testing, issue #1217: Add coverage testing into docker-ci
Upstream-commit: 0aa2470c768934875d9b0a765fc82813950b9ad4
Component: engine
 2013-07-18 14:27:37 -07:00
Victor Vieux 03dd48c968 Merge pull request #1230 from dotcloud/switch_dev 
switch version to -dev
Upstream-commit: edc68f84f3828a53cc2bc6bbc3339a2a13137b20
Component: engine
 2013-07-18 13:50:40 -07:00
Victor Vieux 325ed80b66 switch version to -dev 
Upstream-commit: 0089dd05e910852d5b821074c73287e730040630
Component: engine
 2013-07-18 20:50:04 +00:00
Victor Vieux d7ec6adcd6 Merge pull request #1227 from dotcloud/bump_0.5.0 
Bump to 0.5.0
Upstream-commit: 51f6c4a7372450d164c61e0054daf0223ddbd909
Component: engine
 2013-07-18 11:51:29 -07:00
Andy Rothfusz e4606d6f3f Merge pull request #1226 from metalivedev/easydockerfile 
Make dockerfile docs easier to find. Clean up formatting.
Upstream-commit: f4eaec3e1e85dd8774e0b00082d31188f55f4de2
Component: engine
 2013-07-18 10:14:22 -07:00
Victor Vieux 608601a191 change -b -> -v and add udp example 
Upstream-commit: b083418257edbcb769dd1bf9a6a3dafd334d5969
Component: engine
 2013-07-18 16:25:14 +00:00
Victor Vieux 093a55ab02 Merge pull request #1169 from crosbymichael/buildfile-tests 
Add unit tests for buildfile config instructions
Upstream-commit: 5794857f7ad9e3d84e2c549253c072d076d702cb
Component: engine
 2013-07-18 08:35:23 -07:00
Michael Crosby 1df4154799 Add unit tests for buildfile config instructions 
Add tests for instructions in the buildfile that
modify the config of the resulting image.
Upstream-commit: e7f3f6fa5a10f890a1774a2320d31e236af56be9
Component: engine
 2013-07-18 05:37:28 -09:00
Andy Rothfusz 97e62e30e8 Make dockerfile docs easier to find. Clean up formatting. 
Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630
Component: engine
 2013-07-17 18:56:40 -07:00
Victor Vieux 7446d96bad Merge pull request #1225 from dotcloud/hotfix_docker_rmi 
*Runtime: improve docker rmi via id
Upstream-commit: f8dfd0aa5e03f3f8819dea6bb59800c90824008c
Component: engine
 2013-07-17 14:31:56 -07:00
Andy Rothfusz 3e4e3b1c00 Merge pull request #1219 from metalivedev/docs-repoupdate 
Update docs with 0.5 repository information.
Upstream-commit: 3dbf9c6560fe1741cde9e8e2ce6ac98acf26e8ce
Component: engine
 2013-07-17 13:53:12 -07:00
Guillaume J. Charmes 2b2f5cce76 Merge pull request #1194 from crosbymichael/build-verbose 
* Builder: Add verbose output to docker build
Upstream-commit: de563a3ea372432acb39e711eeb0b43296754c39
Component: engine
 2013-07-17 12:53:06 -07:00
Victor Vieux a44b5f6d5b change rm usage in docs 
Upstream-commit: 9cf2b41c053d557af6c563311b4953c4b9bab6d6
Component: engine
 2013-07-17 19:24:54 +00:00
Victor Vieux aa3ed33e67 Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master 
Upstream-commit: f310b875f8972870e87e4395b5dbd8613b66fa39
Component: engine
 2013-07-17 19:23:06 +00:00
Solomon Hykes 926b49f016 Changed date on changelog 
Upstream-commit: ac14c463d55494fdab88d36ea74a4ecef8ab48dc
Component: engine
 2013-07-17 11:51:26 -07:00
Guillaume J. Charmes 59f9a15c00 Merge pull request #1212 from dotcloud/merge_v_b_options 
* Runtime: Merge -b and -v options
Upstream-commit: 578e88891577960bf0961b49a52f494cfc977a5e
Component: engine
 2013-07-17 11:43:47 -07:00
Victor Vieux 7e19e5b9cc Merge pull request #1222 from lopter/master 
Always stop the opposite goroutine in network_proxy.go (closes #1213)
Upstream-commit: 5231bf3653a291ae0c3cfc0e5132074cb55e71d5
Component: engine
 2013-07-17 11:40:33 -07:00
Solomon Hykes 76eb7762ab Small changes in changelog wording 
Upstream-commit: 8af945f353379a96eb036d67fb24d489c5e16808
Component: engine
 2013-07-17 11:39:38 -07:00
Ken Cochrane 28398dc429 updated with notes from @vieux 
Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20
Component: engine
 2013-07-17 13:46:11 -04:00
Victor Vieux 7d6b6db98e fix docker rmi via id 
Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6
Component: engine
 2013-07-17 15:48:53 +00:00
Louis Opter be8eb02780 Always stop the opposite goroutine in network_proxy.go (closes #1213) 
Upstream-commit: c766d064ac6c2183321cb2e47ea8c0b0b2d2d238
Component: engine
 2013-07-17 01:05:11 -07:00
Andy Rothfusz 2953a9d955 Update repository information. 
Upstream-commit: 0356081c0ad2f1d95fb435f9a491f7a7a63cbf33
Component: engine
 2013-07-16 17:04:41 -07:00
Daniel Mizyrycki 73fd748fb2 Testing, issue #1217: Add coverage testing into docker-ci 
Upstream-commit: 6e8bfc8d12ca062dc4c311d528784c1dec27079d
Component: engine
 2013-07-16 13:45:43 -07:00
Guillaume J. Charmes a4a2ab57ce Update docs 
Upstream-commit: 18e91d5f85a008ef48d724db964330ddaa1bbf10
Component: engine
 2013-07-16 10:14:21 -07:00
Guillaume J. Charmes ef03a6ab8c Hotfix: make sure ./utils tests pass 
Upstream-commit: 1004d57b85fc3714b089da4c457228690f254504
Component: engine
 2013-07-15 17:58:23 -07:00
Nick Stinemates f64f4f840f Merge pull request #1210 from dotcloud/improve_configmerge 
improve mergeconfig, ...
Upstream-commit: f9e4ef5eb0f48da1c562865017c183b57737985c
Component: engine
 2013-07-15 18:04:12 -07:00
Guillaume J. Charmes df2dfb45a8 Merge -b and -v options 
Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861
Component: engine
 2013-07-15 17:51:32 -07:00
Guillaume J. Charmes 723f4f9ef0 Bump version to 0.5.0 
Upstream-commit: bc21b3ebf0dadc51e47d971217d132e5299831a0
Component: engine
 2013-07-15 14:57:52 -07:00
Solomon Hykes 9051673e68 Merge pull request #1184 from dotcloud/1176-packaging-release 
Hack: document PPA release step
Upstream-commit: 608fb2a21e948018bd5c75e56f5555123fda9bc7
Component: engine
 2013-07-15 13:59:55 -07:00
Michael Crosby f98fac335f Do not overwrite container volumes from config 
Fixes #819 Use same persistent volume when a container is restarted
Upstream-commit: 92cbb7cc80a63299b5670a9fcbb2d11789200696
Component: engine
 2013-07-15 11:59:11 -09:00
Solomon Hykes f15cfa7eb5 Merge pull request #1188 from dotcloud/1174-packaging-binary 
Packaging: add pure binary to docker release
Upstream-commit: 45050d9887fc7e4604eed21bb3b8fec320a11d30
Component: engine
 2013-07-15 13:59:06 -07:00
Daniel Mizyrycki 72d4396796 packaging, issue #1176: Document PPA release step 
Upstream-commit: 75a0052e64d0b9cc214cd58ba798863c69f6c5d3
Component: engine
 2013-07-15 12:13:51 -07:00
Guillaume J. Charmes 6a9b073bb8 Merge pull request #1208 from crosbymichael/1201-rw-volumes-from 
- Volumes: Copy VolumesRW values when using --volumes-from
Upstream-commit: c8efd0838430aeeaef15bfd5ef62aecee4cdc603
Component: engine
 2013-07-15 10:59:51 -07:00
Guillaume J. Charmes ff7fe2dacd Merge pull request #1096 from dotcloud/remove_os_user 
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
Upstream-commit: 454cd147fb6133319ecdcda962b6aa137f28f32a
Component: engine
 2013-07-15 10:19:09 -07:00
Guillaume J. Charmes 08204dd54e Add unit test to check wrong uid case 
Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e
Component: engine
 2013-07-15 10:05:09 -07:00
Victor Vieux c3b2bff375 improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace 
Upstream-commit: 193a7e1dc1945bc9988b6205c63db9d2e0578c55
Component: engine
 2013-07-15 13:12:33 +00:00
Michael Crosby 6fdf5346ea Copy VolumesRW values when using --volumes-from 
Fixes #1201
Upstream-commit: 5ae8c7a98592f83a31f3f45fc22728e45e95626c
Component: engine
 2013-07-14 18:23:20 -09:00
Victor Vieux f58c6a0202 Merge pull request #1200 from ToothlessGear/fix-whitespaces_progessbar 
Fix progressbar, without messing up other outputs
Upstream-commit: 9b57f9187b84c5cdb92cb50271988aa4c51e8b95
Component: engine
 2013-07-13 08:50:50 -07:00
Victor Vieux 4e2ad07ebe Merge pull request #1190 from dotcloud/1189-add_debug_error 
* RemoteAPI: Improve debug
Upstream-commit: 50e45b485ff61901faec1d79889d801bca7daae1
Component: engine
 2013-07-13 08:15:59 -07:00
Victor Vieux 89d632a562 Merge pull request #1198 from dotcloud/fix_pull_tag 
Fixed tag option for "docker pull" (the option was ignored)
Upstream-commit: 2051ebc0eb1d43cc66037dddc9202e9f1c44b676
Component: engine
 2013-07-13 08:14:47 -07:00
Guillaume J. Charmes 26198a8a13 Merge pull request #1054 from nickstenning/getimage-by-tag 
* Runtime: Reverse priority of tag lookup in TagStore.GetImage
Upstream-commit: 933b9d44e1a0c1626b15e6a2d5a051db334d8a27
Component: engine
 2013-07-12 16:15:04 -07:00
Nick Stenning 54ca7a355c Reverse priority of tag lookup in TagStore.GetImage 
Currently, if you have the following images:

    foo/bar      1       23b27d50fb49
    foo/bar      2       f2b86ec3fcc4

And you issue the following command:

    docker tag foo/bar:2 foo/bar latest

docker will tag the "wrong" image, because the image id for foo/bar:1 starts
with a "2". That is, you'll end up with the following:

    foo/bar      1       23b27d50fb49
    foo/bar      2       f2b86ec3fcc4
    foo/bar      latest  23b27d50fb49

This commit reverses the priority given to tags vs. image ids in the
construction `<user>/<repo>:<tagOrId>`, meaning that if a tag that is an exact
match for the specified `tagOrId`, it will be tagged in preference to an image
with an id that happens to start with the correct character sequence.
Upstream-commit: 44b3e8d51b655d68d0a253c48c027360ff8c3a97
Component: engine
 2013-07-12 23:56:36 +01:00
Daniel Mizyrycki 8b3fabeb5f Merge pull request #1083 from hukeli/debian 
Keep debian package up-to-date
Upstream-commit: 9bf8ad741ff3a0f5130d5ad0e0b6c4e99ab31892
Component: engine
 2013-07-12 15:24:37 -07:00
Daniel Mizyrycki 9da4e15f2e Merge pull request #1203 from dotcloud/1202-packaging-debian 
Packaging, issue #1202: Upgrade vagrantfile go in debian packaging
Upstream-commit: 9913ebbe2153d2c2de2396f10f3da9dfa1c66343
Component: engine
 2013-07-12 15:11:57 -07:00
Daniel Mizyrycki 969d894058 Packaging, issue #1202: Upgrade vagrantfile go in debian packaging 
Upstream-commit: c7a48e91d8d31a8b80b46f4cb17d866e36147ddc
Component: engine
 2013-07-12 15:06:12 -07:00
Solomon Hykes 3cd7f4b75d Merge pull request #1195 from dotcloud/tests-cleanup 
* Hack: tests cleanup
Upstream-commit: 2cbf2200ac7ba7e3ae79ed8a85a3cfcdf1026efd
Component: engine
 2013-07-12 14:51:59 -07:00
Marcus Farkas 51c31b8a66 *Client: Fix the progressbar, without manipulating other outputs 
Prior this commit, 'docker images' and other cmd's, which used utils.HumanSize(),
showed unnecessary whitespaces.
Formatting of progress has been moved to FormatProgess(), justifing the string
directly in the template.
Upstream-commit: bac5772312d1fe733511febd117e9f29ff19c698
Component: engine
 2013-07-12 20:15:25 +02:00