p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,337 Commits 2 Branches 295 Tags
efbfc9bcffdbd4065fc9da2af63b7582d7a7d2f2
Commit Graph

9337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack
efbfc9bcff Merge pull request #6645 from snitm/dmthinp-devel 
Dmthinp devel
Upstream-commit: 2e4f99d99c34edaba2d37270545af2b8fd753dab
Component: engine
 2014-07-07 21:20:31 +03:00
Victor Vieux
5a10cf09e4 Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli 
Moved last build tests to integration-cli
Upstream-commit: 880c98d2d3500a5b694eb4e3a610b6aedf1fa493
Component: engine
 2014-07-07 10:53:26 -07:00
Michael Crosby
111401852c Merge pull request #6508 from mheon/signals 
Increase size of buffer for signal forwarding with --sig-proxy
Upstream-commit: 860c664ccbe1fd680be3952034126d82ce73a064
Component: engine
 2014-07-07 10:45:31 -07:00
Michael Crosby
6a68c558b1 Merge pull request #6371 from jpetazzo/6370-masquerade 
Select masquerade by outgoing interface rather than by destination subne...
Upstream-commit: bcec0f30e8d7dbb9fcdd6a85fa4b8e4953ba66ff
Component: engine
 2014-07-07 10:28:31 -07:00
Victor Vieux
35129fcf06 Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version 
add client OS and arch to docker version
Upstream-commit: dd89904ad3ad8147fb046db0e5fef9f6379f9a39
Component: engine
 2014-07-07 10:15:30 -07:00
Victor Vieux
d1bf2949a1 Merge pull request #6823 from folieadrien/move_integration_tests 
Convert TestGetImagesByName into unit and integration-cli test
Upstream-commit: 4a20c9b005362ffdaa6b1b71adab1063191cf9f5
Component: engine
 2014-07-07 10:13:19 -07:00
Tianon Gravi
7655d4fdd1 Merge pull request #6884 from tianon/use-docker-based-travis 
Update Travis to use pretty Docker-based workers
Upstream-commit: de07654c60d74efac10f14ff01039dd757a7dbd8
Component: engine
 2014-07-07 10:09:31 -06:00
Tianon Gravi
2f832eb657 Update Travis to use pretty Docker-based workers 
These start up much faster and the only caveat is that we can't use "sudo" (which we don't currently use anyhow).

Also, I've updated the Go version here to match what's in the Dockerfile.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3e2ad6ffee68be7f3462fd1311408c7880cd8d88
Component: engine
 2014-07-07 10:04:23 -06:00
Tianon Gravi
034524b6c9 Merge pull request #6883 from tianon/fix-dco-parsing-for-numeric 
Fix DCO parsing for numeric github handles like cpuguy83
Upstream-commit: 09927fdbae59af6ac2134e3bbfeea90af9d432b0
Component: engine
 2014-07-07 10:02:02 -06:00
Tianon Gravi
03141b4b87 Fix DCO parsing for numeric github handles like cpuguy83 
Turns out, "alphanumeric" actually means both "alpha" AND "numeric". Dur.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bbbf64242726dee184f82b3bb355327c9c85b274
Component: engine
 2014-07-07 09:57:50 -06:00
unclejack
1485171732 Merge pull request #6756 from kzys/lxc-linux 
Skip lxc_template_unit_test.go on non-Linux platforms
Upstream-commit: e2c575c5a618c51f08d457fc227276dcb340e0f0
Component: engine
 2014-07-07 18:46:46 +03:00
Tianon Gravi
a5e156407f Merge pull request #6878 from tianon/update-travis-github-username-regex 
Update the Travis GitHub username regex to match the GitHub username requirements
Upstream-commit: cafb1bfd76b902437d06b713dc400b9076030ccb
Component: engine
 2014-07-07 09:26:32 -06:00
unclejack
4f072fe2fa Merge pull request #6573 from mheon/ps_cleanup 
Escape control and nonprintable characters in docker ps
Upstream-commit: 2ffd13bc3159ef3a1f97d9a59cfe7704264c2db1
Component: engine
 2014-07-07 18:23:18 +03:00
Tianon Gravi
52c8349536 Merge pull request #6873 from tianon/6836-fix-systemd-socket-perms 
Fix the systemd socket activation socket permissions
Upstream-commit: 07be572f8efc7ab61b8cf31b89d7b6ae8cd1975a
Component: engine
 2014-07-07 08:56:04 -06:00
Tianon Gravi
1107c3c89f Update the Travis GitHub username regex to match the GitHub username requirements 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e895817ad72c681b265bc647d18f201ceced90c5
Component: engine
 2014-07-07 08:36:31 -06:00
Tianon Gravi
9eda104cfe Fix the systemd socket activation socket permissions 
Fixes #6836

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3589f5b9c2d9e5cb6d057713aa8d591295c5f523
Component: engine
 2014-07-07 08:09:25 -06:00
Sven Dowideit
58385e59a1 Merge pull request #6840 from gesellix/patch-1 
docs: add Groovy Docker-Client link
Upstream-commit: 323e6a3cf29677459a7bc658a0b5221e5675bc46
Component: engine
 2014-07-07 11:16:55 +10:00
Sven Dowideit
1f0f85afed Merge pull request #6846 from irbull/master 
Fix the parent/child relationship in the docs
Upstream-commit: cf01997ebeea84b31c35bb99253e5f3ca5b05533
Component: engine
 2014-07-07 10:27:27 +10:00
Sven Dowideit
52657753ea Merge pull request #6860 from felixrabe/patch-7 
run.md: Fix references to cli
Upstream-commit: 2f649301e5ee45204bcb6ab48a2a52c18e8cd5a6
Component: engine
 2014-07-07 09:37:42 +10:00
Felix Rabe
0664d3e7f1 run.md: Fix references to cli 
There are now no other occurrences of `#cli-` in this document.

TODO: Find other places with wrong links.
Upstream-commit: 95870ef3349920efc981a703d52f5832b79ee18e
Component: engine
 2014-07-06 14:47:37 +02:00
LK4D4
3c88fb5533 Moved last build tests to integration-cli 
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d4862b7a2d0c3b0641ce6d539eabecee686c794
Component: engine
 2014-07-06 15:36:34 +04:00
Ian Bull
8ad8344e9f Fix the parent/child relationship in the docs 
In the Docker Linking Docs, the parent child relationship
was backwards. The Web container should be able to access
the DB, not other way around. Furthermore, the output of
'docker ps' was wrong (it showed that the DB could access
the Web). This fixes both typos.

Docker-DCO-1.1-Signed-off-by: Ian Bull <irbull@gmail.com> (github: irbull)
Upstream-commit: 29a20672c216e2f8aa90af765ac5c47e3350b3d9
Component: engine
 2014-07-05 13:58:09 -07:00
Tianon Gravi
e546ff222c Merge pull request #6852 from Odaeus/patch-1 
Fix "Error while reading file" in Fish completion
Upstream-commit: 02ef9437d3b55301ded005806b1649238afdbdad
Component: engine
 2014-07-04 08:11:12 -06:00
Andrew France
5f0247a4bd Fix "Error while reading file" Fish completion 
An unbalanced single quote caused Fish to fail to load the completion file with `source: Error while reading file “/etc/fish/completions/docker.fish”`.

Docker-DCO-1.1-Signed-off-by: Andrew France <andrew@avito.co.uk> (github: Odaeus)
Upstream-commit: 6ad5fe86590f757eca754d5bb4a599faec63ae30
Component: engine
 2014-07-04 15:07:49 +01:00
Sven Dowideit
bb9d32707c add client OS and arch to docker version 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: eceacb8334250b9f241b263f28372d5f35ada71d
Component: engine
 2014-07-04 21:23:36 +10:00
Victor Vieux
5488e10c5e Merge pull request #6771 from LK4D4/fix_containers_list_race 
Add synchronization in server.Containers
Upstream-commit: 44d737707c513dd987933642680c36ef586b1b0e
Component: engine
 2014-07-03 17:53:50 -07:00
Tibor Vass
6c8d9902d6 Merge pull request #6801 from cpuguy83/remove_dup_run_tests 
Remove dup tests
Upstream-commit: 0cdda85df2a1aee0350fd344e6128eb2c2e4ef8a
Component: engine
 2014-07-03 18:30:58 -04:00
Brian Goff
0c1cce45f2 Remove dup tests 
integration/server_test.go/TestCreateNumberUsername == integration-cli/docker_cli_run_test.go/TestUserByID
integration/server_test.go/TestRmi == integration-cli/docker_cli_images_test.go/TestCLIImageTagRemove

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0a3abe33f0bd9b7dfc36021b6f10d0857a432d40
Component: engine
 2014-07-03 17:35:03 -04:00
Fred Lifton
d0e1c39f45 Merge pull request #6842 from mrorii/patch-1 
doc fix: remove trailing *
Upstream-commit: 8f97a1778e028458878b20ce697bc24bb0e5ad59
Component: engine
 2014-07-03 14:30:41 -07:00
Naoki Orii
f9a8a47305 doc fix: remove trailing * 
The trailing `*` makes it seem like there is some kind of annotation
Upstream-commit: 6e4b37fffdfc324141aae9f86268db4e8ed7aeb0
Component: engine
 2014-07-03 14:02:40 -07:00
Tobias Gesellchen
984e0d89c3 docs: add Groovy Docker-Client link 
Docker-DCO-1.1-Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> (github: gesellix)
Upstream-commit: 5c246c931eec7ec31a90fc4ae1577eb54f938427
Component: engine
 2014-07-03 22:24:24 +02:00
Victor Vieux
455f212f47 Merge pull request #6838 from vieux/merge_release_v1.1.0 
Merge release v1.1.0
Upstream-commit: 700880ca16898bc9d007cc76323e661bc28034e1
Component: engine
 2014-07-03 11:04:26 -07:00
Victor Vieux
a796dc81bf Change version to 1.1.0-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: d55cafb72e25e5ef9b400c1c010e9832ec8b5561
Component: engine
 2014-07-03 18:01:36 +00:00
Victor Vieux
d70b3f49e3 Merge remote-tracking branch 'origin/release' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3191bf042d704a1e1d4aaeacd3e2bf257685558
Component: engine
 2014-07-03 18:01:13 +00:00
Victor Vieux
18bd597c01 Merge pull request #6818 from vieux/bump_v1.1.0 
Bump v1.1.0
Upstream-commit: 4c52272a2dbe642869d5e915435ebe16cc9045b8
Component: engine
 2014-07-03 10:57:44 -07:00
James Turnbull
3aeb3e2a4c Merge pull request #6827 from SvenDowideit/docker-com-theme-regressions 
Fix 2 docker.com theme regressions on docs.docker.com
Upstream-commit: e11a714f7adf0dd0e9c08ad5a443ba04d948475a
Component: engine
 2014-07-03 07:30:18 -04:00
Sven Dowideit
6e61659fda Fix 2 docker.com theme regressions on docs.docker.com 
- Hover colours of doc nav wrong
- Primary Docs Nav not active when user is Logged in.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 873241790f802351d36c490046435215b33e4551
Component: engine
 2014-07-02 21:19:48 -07:00
Victor Vieux
2d54d0cea4 Bump version to v1.1.0 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 79812e36468c6e9be19b7c028e37787d5ae6288b
Component: engine
 2014-07-03 01:15:11 +00:00
Sven Dowideit
6c13e82462 Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess 
missed these merge conflicts when manually rebasing too many files
Upstream-commit: 6eda9f3207b349b0d2759c70174185bf0d0c09a1
Component: engine
 2014-07-03 11:12:13 +10:00
SvenDowideit
a07084dd27 missed these merge conflicts when manually rebasing too many files 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f8d9ecfb2ceda0cc2aed3d8fd3fbcbf625a8fcdd
Component: engine
 2014-07-03 11:07:42 +10:00
Sven Dowideit
3309d6e15c Merge pull request #6824 from fredlf/1-1_release_notes 
Added Release Notes
Upstream-commit: 9fe95f1c5bae60bad72f056b109e4b1b694d7dc0
Component: engine
 2014-07-03 10:45:11 +10:00
Fred Lifton
478a3a5c9d Corrected version number to 3 digits. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: c3f4972f6d036520df589676c7ebeef397d327c2
Component: engine
 2014-07-02 17:41:52 -07:00
Sven Dowideit
28b9680123 Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit 
update release checklist and .gitignore
Upstream-commit: 65e4b57fda5b43ba2c1aa6db922b193b9b809600
Component: engine
 2014-07-03 10:36:52 +10:00
Fred Lifton
0af6d2b16e Merge pull request #6807 from SvenDowideit/convert-more-docker.io-to-docker.com 
some docker.io -. docker.com conversions
Upstream-commit: f746a48fe63689f07712bba6996ff98fd5d164b0
Component: engine
 2014-07-02 17:34:31 -07:00
SvenDowideit
c8806a50df I'm going to wish I didn't do this 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fa29b1f062d25c1a8ca62f02b9cc7533df4c7449
Component: engine
 2014-07-03 10:31:56 +10:00
Fred Lifton
32f2fa1de6 Merge pull request #6790 from SvenDowideit/pr_out_update_cli_md 
update cli.md
Upstream-commit: 2c32c195d972045422b6e2618cc9ef48b275f89a
Component: engine
 2014-07-02 17:24:53 -07:00
SvenDowideit
bedc0093af Update cli.md and man pages to match current cli 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b07f193822d00e40580cd11320ed7e01b629f9d7
Component: engine
 2014-07-03 10:22:20 +10:00
James Turnbull
7c1601352b Fixed numerous inconsistencies in command help text 
* Replaced docker with Docker.
* Consistently used STDIN, STDOUT, STDERR.
* Consistently used TTY.
* Fixed some grammar and spelling issues.
* Fixed references to the index.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: SvenDowideit)
Upstream-commit: b59754bcb32fe5b8f416f407f71d2b50bb148c8a
Component: engine
 2014-07-03 10:22:09 +10:00
Adrien Folie
6b22b2d896 Move TestGetImagesByName 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: f337a52a6ec01684c326a827adbe3d0b8b5f1f53
Component: engine
 2014-07-03 01:39:08 +02:00
Fred Lifton
f26079f0a4 Added Release Notes 
Release notes for v.1.1 have been added to the docs index.md page. Made some revisions to
other content to make it shorter.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: d946cae36436a270b14d53585624e5567e590db2
Component: engine
 2014-07-02 16:33:13 -07:00