toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,369 Commits 3 Branches 295 Tags
b2ebfa1e4fc12e87e78e30835b49ede9d6c7d035
Commit Graph
5369 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby b2ebfa1e4f Merge pull request #3426 from bcbcarl/3425-upgrade_vbox_guest_additions 
Upgrade VBox Guest Additions (Fix #3425)
Upstream-commit: 1363dfdd1d6ccb2612d35c3fb29d460a58ba33b9
Component: engine
 2014-01-06 10:39:26 -08:00
Victor Vieux 1c8add2753 Merge pull request #3367 from cpuguy83/3362-unify_cmd_entrypoint_handling 
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
Upstream-commit: e5b09523dcfabcd252113a8ebda5391c88e777e5
Component: engine
 2014-01-06 10:29:37 -08:00
Victor Vieux 1e33ac0792 Merge pull request #3441 from RoelVanNyen/container_start 
Just pass the container in RegisterLinks(), no need to lookup by name
Upstream-commit: d44abae873f9327962ee9a2ad079a17c582e9661
Component: engine
 2014-01-06 10:19:01 -08:00
Brian Goff 81433035f2 Use same error handling while unmarshalling args for CMD and ENTRYPOINT 
Upstream-commit: 323c4b5211ecef4cffcbe0a97811ddd93c469164
Component: engine
 2014-01-06 13:15:14 -05:00
Michael Crosby acd3d57601 Merge pull request #3335 from vieux/remote_todo 
add REMOTE_TODO
Upstream-commit: 5b4a0cac4ef0b8197b9088fd2228ff3b690889cd
Component: engine
 2014-01-06 10:12:08 -08:00
Victor Vieux 3ca59b8ac9 Merge pull request #3455 from crigor/fix-pull-message 
Fix login message to say pull instead of push.
Upstream-commit: 73294b6d561e98a9ebf490f3a2819c6a329693b9
Component: engine
 2014-01-06 10:02:32 -08:00
Victor Vieux 99c49adf29 Merge pull request #3445 from dotcloud/merge_release_v0.7.3 
Merge release v0.7.3
Upstream-commit: dfc2dc4d355cac57a7b119c6a1db49a1ca5c85fd
Component: engine
 2014-01-06 09:51:41 -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 ee3a7b50db Merge pull request #3454 from sudosurootdev/master 
Fix spelling error in hack/make.sh comment
Upstream-commit: af50b2f17c66b789de079861fb3f5e5678cb8d30
Component: engine
 2014-01-04 20:24:48 -08:00
sudosurootdev 4e140a2de4 Spelling error. 
Upstream-commit: 2a1181f404387f6d530a86a6196b40a6dd541c20
Component: engine
 2014-01-04 23:15:15 -05:00
Tianon Gravi 844b950018 Merge pull request #3448 from tmahesh/patch-1 
Changelog date typo fix: 2013-01-02 -> 2014-01-02
Upstream-commit: f7afbf34fe8e608997cc9b43784bc78fd2886be8
Component: engine
 2014-01-04 08:21:48 -08:00
Mahesh Tiyyagura c46f1834e7 Changelog date typo fix: 2013-01-02 -> 2014-01-02 
Upstream-commit: 3069bf946047e42b4aa468617caffb45829317b6
Component: engine
 2014-01-04 11:24:48 +05:30
Tianon Gravi f8f546ba21 Change version to 0.7.3-dev 
Upstream-commit: 32b9a429c5d36785a4a544d6e7236a95a4310983
Component: engine
 2014-01-03 17:02:59 -07:00
Tianon Gravi a04cd2e096 Merge pull request #3439 from dotcloud/bump_v0.7.3 
Bump v0.7.3
Upstream-commit: 76910d16cc9e0d11bd60939d1855639fd2930362
Component: engine
 2014-01-03 16:01:56 -08:00
Roel Van Nyen 8b66161d6d Just pass the container in RegisterLinks(), no need to lookup by name again 
Upstream-commit: 42c7dc448f550c954aeba14cd20d1dff12845c73
Component: engine
 2014-01-03 15:49:39 +01:00
Tianon Gravi 5e06bc9bb4 Bump version to v0.7.3 
Upstream-commit: 8502ad4ba7b5410eb55f3517a801b33f61b1f625
Component: engine
 2014-01-02 21:19:19 -07:00
Andy Rothfusz c5289665c4 substantial spelling fix 
Upstream-commit: 58ec7855bc4f724a32f585f4455b5d954f335c3c
Component: engine
 2014-01-02 16:46:50 -08:00
Andy Rothfusz b8a11b19d9 Merge pull request #3437 from jamtur01/faqhere 
Fixed duplicate here references in FAQ
Upstream-commit: 949fde88df5c11447cea7115ce3a2bcf7c73ed6d
Component: engine
 2014-01-02 16:44:38 -08:00
James Turnbull 64b666faf6 Fixed duplicate here references in FAQ 
Upstream-commit: 5a9f45cb7ae44bb194b2643994c6a0d53b856645
Component: engine
 2014-01-02 19:40:19 -05:00
Andy Rothfusz f9507b6c4d Merge pull request #3428 from jamtur01/port1.8 
Added some 1.7 API updates that were missing from 1.8
Upstream-commit: 8f4a54734fac24b4e7ce3019c9a693d7ed72c577
Component: engine
 2014-01-02 16:34:56 -08:00
Andy Rothfusz c44a0a380b Merge pull request #3389 from SvenDowideit/3366-simplify-volumes-documentation 
simplify the volumes documentation and mention more details
Upstream-commit: 9359d79c4f39c94b6fd1826bd66a41f9f4303b09
Component: engine
 2014-01-02 16:29:09 -08:00
James Turnbull ca1a9efe84 Added some 1.7 API updates that were missing from 1.8 
Upstream-commit: 69db6ea867ca155ecf6c342e82df491cdcd6aa96
Component: engine
 2014-01-02 19:27:59 -05:00
Andy Rothfusz 1298c1b521 Merge pull request #3409 from Chris00/patch-1 
Mention lxc-checkconfig
Upstream-commit: 3b89187d0388ea386cf2c8e00361744442e46654
Component: engine
 2014-01-02 16:20:30 -08:00
Andy Rothfusz 8ca6e8443f Keep original transcript in Thatcher's voice 
and clarify that this is an update to the example.
Upstream-commit: 82a47b0e82367aa5f1b6d15816c7e66abdffb06a
Component: engine
 2014-01-02 16:17:52 -08:00
Andy Rothfusz 1aab0cdc3a Merge pull request #3399 from rgstephens/patch-1 
Update for Ubuntu 13.10
Upstream-commit: e0f07bc18614c5cc9065e75a3f43cdf4ca0ab605
Component: engine
 2014-01-02 16:14:47 -08:00
Guillaume J. Charmes cf9f2e5413 Merge pull request #3353 from creack/improve_add_cache 
Improve add cache
Upstream-commit: 194eb246efc68647fd5c4efc240b49fc76235a90
Component: engine
 2014-01-02 16:07:33 -08:00
Michael Crosby e353a77e4f Merge pull request #3287 from vieux/fix_progressbar_display_push 
fix progressbar in docker push
Upstream-commit: 81e596e27288c1dd9c48273fcd131742ef8e2d89
Component: engine
 2014-01-02 13:38:11 -08:00
Tianon Gravi 72d8d828d0 Merge pull request #3427 from tianon/stub-deb-init-config 
Add stubbed and commented "/etc/default/docker" to our deb package
Upstream-commit: acfdfa81be7d0e7ec38b607dc2da06d86bb75167
Component: engine
 2014-01-02 09:44:36 -08:00
Tianon Gravi 92d3a8ac6c Add stubbed and commented "/etc/default/docker" to our deb package 
This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
Upstream-commit: 7fd6dcc831d28cc1ca1a5d56c9043354228f087d
Component: engine
 2014-01-01 22:34:22 -07:00
Carl X. Su 9fec717a30 Upgrade VBox Guest Additions (Fix #3425) 
Upstream-commit: 848f290012a06e84723cad5f9222697c367b0a61
Component: engine
 2014-01-02 12:56:29 +08:00
James Turnbull 3f7d1e5993 Merge pull request #3419 from newzealandpaul/master 
Mac OS X command in docs for pip fixed
Upstream-commit: add97f7eb0de5264cabb4d3bfb59ef6a8e4870ba
Component: engine
 2014-01-01 20:27:38 -08:00
Tianon Gravi b5783c4b92 Merge pull request #3374 from tianon/fpm-license-vendor 
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
Upstream-commit: 5f557842246eb1d83b94732754760e87416386cb
Component: engine
 2014-01-01 14:42:47 -08:00
Paul 5d674e11a2 Mac OSX command for pip was incorrect 
Upstream-commit: f3816ee024fe66a207381832bfc97ea123ec72ed
Component: engine
 2014-01-02 09:52:07 +13:00
Christophe Troestler a97ab92d81 Implement suggestions 
Upstream-commit: 0b3e153588876fdc2bddde2e9064598e26276a09
Component: engine
 2014-01-01 12:28:22 +01:00
Christophe Troestler f1fad2f495 Mention lxc-checkconfig 
This is important because the list below is not complete when one build one's own kernel.  Plus it is more robust in the face of changes.
Upstream-commit: 22269894105d8553fc3608fe3f749f5001a37ca0
Component: engine
 2014-01-01 00:59:47 +01:00
Tianon Gravi f320db2b17 Merge pull request #3398 from thomasleveil/bash_completion_names 
support for container names in bash completion
Upstream-commit: c23b15b9d84ed7d9421d8946c4e0a309e12cecf3
Component: engine
 2013-12-31 08:28:21 -08:00
Thomas LEVEIL deba21c185 support for container names in bash completion 
Upstream-commit: 055b32e3f4adfd490449b41d0cd6bc6ad5b7466a
Component: engine
 2013-12-31 11:34:23 +00:00
Michael Crosby 6beb1be2a4 Merge pull request #3355 from creack/fix_build_exit 
Exit with code 1 in case of error for `docker build`
Upstream-commit: 907d9ce13c6a7e621ff54fe9d81e4d411031ed33
Component: engine
 2013-12-30 22:14:01 -08:00
Tianon Gravi e2b7c8711c Merge pull request #3379 from tianon/organize-contrib-syntax 
Reorganize the syntax highlighting files in contrib under a common directory
Upstream-commit: 74d45789dda863490d81729c954eb1360fdd14fd
Component: engine
 2013-12-30 21:57:19 -08:00
Tianon Gravi 7494334ffd Merge pull request #3392 from tianon/fix-install-failure 
Fix install failure when busybox can't be downloaded
Upstream-commit: 40522c038053cf90f4035fb52a57003fd8ecf25c
Component: engine
 2013-12-30 20:04:30 -08:00
Tianon Gravi 261bec1666 Merge pull request #3401 from odonnellryan/patch-1 
Swap "grep -q" with "grep > /dev/null" so that "go help" doesn't balk when the pipe closes unexpectedly (since "grep -q" closes the pipe the second it finds a match)
Upstream-commit: d5bb0ff80a3cd95ed6a3774248f3ee3561cb5f22
Component: engine
 2013-12-30 18:44:23 -08:00
Ryan O'Donnell 93593cd471 Fixes Issue #3400 
See Issue #3400
Upstream-commit: ad80da33895aa9f2200279282acc25e4b2bcbf27
Component: engine
 2013-12-30 20:58:25 -05:00
rgstephens d5ba3da179 Update for Ubuntu 13.10 
With two additional commands, this procedure will work for Ubuntu 13.10 using the image stackbrew/ubuntu:13.10.

1) change /etc/pam.d/sshd, pam_loginuid line 'required' to 'optional'
2) echo LANG=\"en_US.UTF-8\" > /etc/default/locale
Upstream-commit: 1f80c2a652b03d84718c2e61b7761f939de3b07a
Component: engine
 2013-12-30 17:50:58 -08:00
Andy Rothfusz 6c85a7de88 Merge pull request #3303 from crosbymichael/add-host-flag 
Add DOCKER_HOST env var for client
Upstream-commit: 1bc3f6b7b5fd8d15df2238fc77f5aeb9624a6582
Component: engine
 2013-12-30 15:54:37 -08:00
Andy Rothfusz 46e4624179 Merge pull request #3395 from jamtur01/basicsfixes 
Minor fixes to the basic command documentation
Upstream-commit: 643621133fafc7ea0b479cd636afd1e397055930
Component: engine
 2013-12-30 15:41:59 -08:00
Sven Dowideit f0c55c27ee simplify the volumes documentation and mention more details 
Upstream-commit: fd240413ff835ee72741d839dccbee24e5cc410c
Component: engine
 2013-12-31 09:09:57 +10:00
Solomon Hykes 4e4ce7a3e6 Merge pull request #3344 from tianon/dockerfile-cleanup 
Many various Dockerfile cleanups
Upstream-commit: 392b1e99b2ec9c368f81cca99093a406ae3697b9
Component: engine
 2013-12-30 11:26:13 -08:00
James Turnbull 1a0b6cfa05 Minor fixes to the basic command documentation 
Upstream-commit: 0dfebf2d93e4990f12ba5d434e1750046008782f
Component: engine
 2013-12-30 13:57:11 -05:00
Andy Rothfusz b284ad7fc3 Merge pull request #3394 from jamtur01/clifixes 
Numerous small fixes to the CLI documentation
Upstream-commit: 40aaebe56ac2de4294baacaa8aa61b20c3b2dabe
Component: engine
 2013-12-30 10:56:47 -08:00
James Turnbull 70af7e708f Numerous small fixes to the CLI documentation 
Upstream-commit: a1dba16fe8562ed0545eaa3c6ed23bb1043dd102
Component: engine
 2013-12-30 13:48:12 -05:00