1
0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Andy Rothfusz
5b404255d5 Merge pull request #3483 from lukaspustina/patch-1
Missing redirect in line 85
Upstream-commit: 00ee6d1925688bda77d5055d7e4be1cbd8b64a07
Component: engine
2014-01-07 15:11:02 -08:00
Andy Rothfusz
dffdf1a269 Merge pull request #3462 from tsaavik/patch-2
Simplified and streamlined Amazon Quickstart
Upstream-commit: 6f8a79c23c7ae80a18fb291c7dd65e12b8a6c037
Component: engine
2014-01-07 15:09:35 -08:00
Andy Rothfusz
fc2f70defb Merge pull request #3461 from jbeda/patch-1
Update instructions for mtu flag for Docker on GCE
Upstream-commit: cf8063d1521e7e065e859b3e2f58e52d3b54a0f7
Component: engine
2014-01-07 15:03:19 -08:00
Andy Rothfusz
2cdbf533f4 Merge pull request #3488 from jamtur01/1310
Fixed #3481 - Added Ubuntu Saucy to installation
Upstream-commit: 3e10fe1a156b822e9daea5623411c187b2f5e2a1
Component: engine
2014-01-07 14:56:03 -08:00
Michael Crosby
f676391bcd Merge pull request #3487 from crosbymichael/improve-images-speed
Only get rootfs when we need to calculate the image size
Upstream-commit: 45ecdf9c8e468bb93a96665fe92e526dabf2ee43
Component: engine
2014-01-07 14:47:31 -08:00
Tianon Gravi
0055a569e4 Merge pull request #3491 from tianon/travis-numeric-commit
Fix Travis handling of a fully-numeric commit hash being YAML-converted ...
Upstream-commit: b942f24ba888ee7b9d579955e50b11d98d636f4f
Component: engine
2014-01-07 14:35:06 -08:00
Tianon Gravi
01b84e7dd9 Fix Travis handling of a fully-numeric commit hash being YAML-converted to a number instead of a string
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3779291e9b2f939aa98b91b35552bd9b76c9f39a
Component: engine
2014-01-07 15:27:51 -07:00
Michael Crosby
914d9d5f46 Only get rootfs when we need to calculate the image size
Docker-DCO-1.0-Signed-off-by: Michael Crosby <crosby.michael@gmail.com> (github: crosbymichael)
Upstream-commit: fa14a1b9835a46bc9c48c1385b514a0f8d0b4eac
Component: engine
2014-01-07 13:56:26 -08:00
Tianon Gravi
a9154e9ad5 Merge pull request #3489 from tianon/travis-fixes
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"
Upstream-commit: f9e14cc83884e246478c315964a2fcae03d5e8a8
Component: engine
2014-01-07 12:53:19 -08:00
Victor Vieux
7bb76fbc89 Update REMOTE_TODO.md
Upstream-commit: f2ea539467e34ef06455a3e0561bac1f5a482822
Component: engine
2014-01-07 12:51:17 -08:00
Tianon Gravi
c43b1c60c8 Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master", and to also ignore commits with no content (like a Merge commit - there's no need to sign off on literally nothing)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7c4e5fbd4608bb4b1509552fbe9d3c0bcd7c347a
Component: engine
2014-01-07 13:45:40 -07:00
James Turnbull
5b993f0514 Fixed #3481 - Added Ubuntu Saucy to installation
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net> jamtur01
Upstream-commit: 97ef8a067c77cb8d15e6e336264c6eb21b25a0fb
Component: engine
2014-01-07 11:46:07 -08:00
Michael Crosby
ec223aab35 Merge pull request #2091 from keeb/add-dco
Add Developer Certificate of Origin Text
Upstream-commit: 4b9e475a3d903564e17dba87ec54990967f7f66e
Component: engine
2014-01-07 10:42:53 -08:00
Michael Crosby
29b6e8dfe9 Merge pull request #3431 from shin-/ping_standalone_check
Check standalone header when pinging a registry server.
Upstream-commit: 1d0aeae339aefb7f242035332ed553794b9dab01
Component: engine
2014-01-07 10:33:07 -08:00
Solomon Hykes
5143eb482f Merge pull request #3475 from tianon/travis
Add Travis CI configuration to validate DCO and gofmt
Upstream-commit: 859856b3e46ce8f2359b30400b6f398867a84032
Component: engine
2014-01-07 10:19:43 -08:00
Michael Crosby
a4929b47af Merge pull request #3435 from roylee17/3149-fix_port_mapping_of_tcp_plus_udp
Fix #3149: port mapping of TCP + UDP
Upstream-commit: b8b18a2b428ebc9519b0dd26a18cf7b2d12cea6b
Component: engine
2014-01-07 10:08:13 -08:00
Tianon Gravi
8d4b73a932 Add Travis CI configuration to validate DCO and gofmt
After each push, Travis CI will trigger, and check two things:

- make sure that each commit in the push has the Docker certificate of origin
- make sure that all .go files changed by this sequence of commits are correctly formatted in the most recent commit

Note: there is one edge case; if you do a git force push, we cannot figure out the actual commits in the force push, and we will just run the checks as if upstream master were the base. Pull requests will always be tested correctly, though.

Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 561d1db074edd4e7e7d8b02401abd3fc11b9d51c
Component: engine
2014-01-07 08:25:54 -07:00
Michael Crosby
288d61145c Merge pull request #3480 from tianon/gofmt
Run 'gofmt -s -w'
Upstream-commit: 1f9abfe841e75a9000bd670b6c1c8fed89bd772e
Component: engine
2014-01-07 06:41:23 -08:00
lukaspustina
d1c770b847 Missing pipe in line 85
Upstream-commit: 2b93f1822322e957e7652db2645462ef2ec256bd
Component: engine
2014-01-07 15:20:38 +01:00
Tianon Gravi
af7e2d6bbd Run 'gofmt -s -w'
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
2014-01-06 22:14:35 -07:00
Michael Crosby
87eb8def1e Merge pull request #3477 from creack/fix_tar_leaks
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
Upstream-commit: fca83b4cfb41dbb5dcd933e4944453bac8cea0d3
Component: engine
2014-01-06 18:04:44 -08:00
Guillaume J. Charmes
c075e98c4c Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
Upstream-commit: 444a087ac2ca34776b2b3e4433aa35c27cdfd57a
Component: engine
2014-01-06 17:44:22 -08:00
Victor Vieux
966d13ca39 Update REMOTE_TODO.md
Upstream-commit: e1c861cf331b416c45a5e79102de3b44b13bf1a0
Component: engine
2014-01-06 17:37:30 -08:00
Nick Stinemates
6bb653314b Remove the @github handle as it generates emails.
Upstream-commit: 6fe3da9924fc22bd02eba0803abb42b10fc28baf
Component: engine
2014-01-06 17:21:14 -08:00
Andy Rothfusz
a9ae796dbd Merge pull request #3473 from dhrp/docs-version-warning-fix
[docs] Fix for wrong version warning on master instead of latest.
Upstream-commit: f43f3fa2187450aacbb72380903b109f45d3d0cd
Component: engine
2014-01-06 16:26:04 -08:00
Thatcher Peskens
d7eba898f1 [docs] Fix for wrong version warning on master instead of latest.
Upstream-commit: 1e551c7cc5badc043b1d6a651c3f036c996ef538
Component: engine
2014-01-06 16:18:00 -08:00
Michael Crosby
7660906e4a Merge pull request #3328 from shykes/pkg-iptables
Move utility package 'iptables' to pkg/iptables
Upstream-commit: 2c395ce8fb29bb64a1d6ed6d893116bf8a255c41
Component: engine
2014-01-06 15:54:07 -08:00
Solomon Hykes
d5d32a285c Move utility package 'iptables' to pkg/iptables
Upstream-commit: 7799ae27ca1dd85761f0595346a0dda15bbeda6c
Component: engine
2014-01-06 15:41:24 -08:00
Michael Crosby
563b24676d Merge pull request #3388 from tianon/more-build-tests
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
Upstream-commit: bb754fd34d380fd59f87f6d198361c9ba7239e10
Component: engine
2014-01-06 15:14:30 -08:00
Victor Vieux
2514b9eb9b Merge pull request #3420 from RoelVanNyen/getfullname
Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: a0298c0bd070400b4acaad3c2d285037b5875552
Component: engine
2014-01-06 13:59:04 -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
Nick Stinemates
29c9c05aae Fix dotCloud to Docker, Inc
Upstream-commit: 36ab1836f973c62ff543456f1613dec8813d00df
Component: engine
2014-01-06 12:26:53 -08:00
shin-
656cb5bac1 Fixed registry unit tests
Upstream-commit: 5e8912e0e8537c526ee4f162bdade2656c2fa803
Component: engine
2014-01-06 21:04:44 +01:00
Victor Vieux
54d230777d Merge pull request #3377 from cpuguy83/3333-fix_-H_default
Make blank -H option default to the same as no -H was sent
Upstream-commit: 4e414f62052fd0389d79122db5b0071ddab5d027
Component: engine
2014-01-06 11:30:27 -08:00
Michael Crosby
3d5851faf7 Merge pull request #3310 from pnasrat/cgroups-subpackage
Extract cgroups utilities to own submodule.
Upstream-commit: 4f31141e13bad1c4494a15dd9f283107fc85eee1
Component: engine
2014-01-06 11:27:29 -08:00
Victor Vieux
426d639912 fix error on docker wait
Upstream-commit: 82531f71681c9b5bc5a6c871f81ef67f9e92d708
Component: engine
2014-01-06 11:11:04 -08:00
Michael Crosby
cc98eeb0c8 Merge pull request #3297 from jaseg/master
Return meaningful error for meaningless Dockerfiles
Upstream-commit: ee6823d797e527a18291561aa84cfd6346dd3893
Component: engine
2014-01-06 10:58:24 -08:00
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
Joe Beda
dcc35456a2 Tweak formatting for GCE instructions
Upstream-commit: b308e33106832cd4452f473ff0a54c2031070e0a
Component: engine
2014-01-06 10:35:51 -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
David Mcanulty
35ca0566a9 Simplified and streamlined Amazon Quickstart
The amazon quickstart images are EBS backed and include cloudinit. I've personally tested these documentation changes as a new user to Docker.
Upstream-commit: d6ca05f7cb6fd75a77967049c22eac7104d94633
Component: engine
2014-01-06 09:53:58 -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
David Mcanulty
d48dec166d Fixed error in group add example
There is no ${USERNAME} in bash, only ${USER}
Upstream-commit: fc559d999256a8171015f18fd67e51c39ea5aa32
Component: engine
2014-01-06 09:29:56 -08:00
Joe Beda
a8ce549c09 Update instructions for mtu flag for Docker on GCE
Upstream-commit: ea762c1a51a7dfbb08294c2b6fa105095dd193b3
Component: engine
2014-01-06 09:29:33 -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