clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-22 05:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,326 Commits 9 Branches 112 Tags
bcec0f30e8d7dbb9fcdd6a85fa4b8e4953ba66ff
Commit Graph

9326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby bcec0f30e8 Merge pull request #6371 from jpetazzo/6370-masquerade 
Select masquerade by outgoing interface rather than by destination subne...
 2014-07-07 10:28:31 -07:00
Victor Vieux dd89904ad3 Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version 
add client OS and arch to docker version
 2014-07-07 10:15:30 -07:00
Victor Vieux 4a20c9b005 Merge pull request #6823 from folieadrien/move_integration_tests 
Convert TestGetImagesByName into unit and integration-cli test
 2014-07-07 10:13:19 -07:00
Tianon Gravi de07654c60 Merge pull request #6884 from tianon/use-docker-based-travis 
Update Travis to use pretty Docker-based workers
 2014-07-07 10:09:31 -06:00
Tianon Gravi 3e2ad6ffee 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)
 2014-07-07 10:04:23 -06:00
Tianon Gravi 09927fdbae Merge pull request #6883 from tianon/fix-dco-parsing-for-numeric 
Fix DCO parsing for numeric github handles like cpuguy83
 2014-07-07 10:02:02 -06:00
Tianon Gravi bbbf642427 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)
 2014-07-07 09:57:50 -06:00
unclejack e2c575c5a6 Merge pull request #6756 from kzys/lxc-linux 
Skip lxc_template_unit_test.go on non-Linux platforms
 2014-07-07 18:46:46 +03:00
Tianon Gravi cafb1bfd76 Merge pull request #6878 from tianon/update-travis-github-username-regex 
Update the Travis GitHub username regex to match the GitHub username requirements
 2014-07-07 09:26:32 -06:00
unclejack 2ffd13bc31 Merge pull request #6573 from mheon/ps_cleanup 
Escape control and nonprintable characters in docker ps
 2014-07-07 18:23:18 +03:00
Tianon Gravi 07be572f8e Merge pull request #6873 from tianon/6836-fix-systemd-socket-perms 
Fix the systemd socket activation socket permissions
 2014-07-07 08:56:04 -06:00
Tianon Gravi e895817ad7 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)
 2014-07-07 08:36:31 -06:00
Tianon Gravi 3589f5b9c2 Fix the systemd socket activation socket permissions 
Fixes #6836

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

TODO: Find other places with wrong links.
 2014-07-06 14:47:37 +02:00
Ian Bull 29a20672c2 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)
 2014-07-05 13:58:09 -07:00
Tianon Gravi 02ef9437d3 Merge pull request #6852 from Odaeus/patch-1 
Fix "Error while reading file" in Fish completion
 2014-07-04 08:11:12 -06:00
Andrew France 6ad5fe8659 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)
 2014-07-04 15:07:49 +01:00
Sven Dowideit eceacb8334 add client OS and arch to docker version 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-07-04 21:23:36 +10:00
Victor Vieux 44d737707c Merge pull request #6771 from LK4D4/fix_containers_list_race 
Add synchronization in server.Containers
 2014-07-03 17:53:50 -07:00
Tibor Vass 0cdda85df2 Merge pull request #6801 from cpuguy83/remove_dup_run_tests 
Remove dup tests
 2014-07-03 18:30:58 -04:00
Brian Goff 0a3abe33f0 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)
 2014-07-03 17:35:03 -04:00
Fred Lifton 8f97a1778e Merge pull request #6842 from mrorii/patch-1 
doc fix: remove trailing *
 2014-07-03 14:30:41 -07:00
Naoki Orii 6e4b37fffd doc fix: remove trailing * 
The trailing `*` makes it seem like there is some kind of annotation
 2014-07-03 14:02:40 -07:00
Tobias Gesellchen 5c246c931e docs: add Groovy Docker-Client link 
Docker-DCO-1.1-Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> (github: gesellix)
 2014-07-03 22:24:24 +02:00
Victor Vieux 700880ca16 Merge pull request #6838 from vieux/merge_release_v1.1.0 
Merge release v1.1.0
 2014-07-03 11:04:26 -07:00
Victor Vieux d55cafb72e Change version to 1.1.0-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-03 18:01:36 +00:00
Victor Vieux b3191bf042 Merge remote-tracking branch 'origin/release' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-03 18:01:13 +00:00
Victor Vieux 4c52272a2d Merge pull request #6818 from vieux/bump_v1.1.0 
Bump v1.1.0
 2014-07-03 10:57:44 -07:00
James Turnbull e11a714f7a Merge pull request #6827 from SvenDowideit/docker-com-theme-regressions 
Fix 2 docker.com theme regressions on docs.docker.com
 2014-07-03 07:30:18 -04:00
Sven Dowideit 873241790f 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)
 2014-07-02 21:19:48 -07:00
Victor Vieux 79812e3646 Bump version to v1.1.0 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
v1.1.0 		2014-07-03 01:15:11 +00:00
Sven Dowideit 6eda9f3207 Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess 
missed these merge conflicts when manually rebasing too many files
 2014-07-03 11:12:13 +10:00
SvenDowideit f8d9ecfb2c missed these merge conflicts when manually rebasing too many files 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 11:07:42 +10:00
Sven Dowideit 9fe95f1c5b Merge pull request #6824 from fredlf/1-1_release_notes 
Added Release Notes
 2014-07-03 10:45:11 +10:00
Fred Lifton c3f4972f6d Corrected version number to 3 digits. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-07-02 17:41:52 -07:00
Sven Dowideit 65e4b57fda Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit 
update release checklist and .gitignore
 2014-07-03 10:36:52 +10:00
Fred Lifton f746a48fe6 Merge pull request #6807 from SvenDowideit/convert-more-docker.io-to-docker.com 
some docker.io -. docker.com conversions
 2014-07-02 17:34:31 -07:00
SvenDowideit fa29b1f062 I'm going to wish I didn't do this 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:31:56 +10:00
Fred Lifton 2c32c195d9 Merge pull request #6790 from SvenDowideit/pr_out_update_cli_md 
update cli.md
 2014-07-02 17:24:53 -07:00
SvenDowideit b07f193822 Update cli.md and man pages to match current cli 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:22:20 +10:00
James Turnbull b59754bcb3 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)
 2014-07-03 10:22:09 +10:00
Adrien Folie f337a52a6e Move TestGetImagesByName 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-03 01:39:08 +02:00
Fred Lifton d946cae364 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)
 2014-07-02 16:33:13 -07:00
Victor Vieux 170ba7f8fe update release checklist and .gitignore 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-02 18:54:14 +00:00
Victor Vieux 8ea3589287 Merge pull request #6808 from vieux/pr_6806 
Add backwards READ compatibility for the old libcontainer API
 2014-07-02 10:51:27 -07:00
Tibor Vass f357b18ee3 Merge pull request #6780 from unclejack/tweak_cli_integration_tests 
Tweak cli integration tests
 2014-07-02 13:16:26 -04:00
unclejack deb57c5144 Merge pull request #6763 from folieadrien/master 
Migrate TestGetImagesHistory into unit and CLI test
 2014-07-02 19:44:21 +03:00