Commit Graph
9835 Commits
Author SHA1 Message Date
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
hyeongkyu.lee 7f05b13374 Update README.md
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 649b50c0b71a21f8ea6b88c63008a0f909fe4113
Component: engine
2014-07-04 18:21:13 +09:00
hyeongkyu.lee 5ec859dbc3 Update README.md
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 3f5ab612c8d0c1775a864e4414846b301e6498e9
Component: engine
2014-07-04 17:59:26 +09:00
Fabio Falci 525592aa62 Relax dns search to accept empty domain
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 804b00cd7d1f084a872211e5043d255c454c8e51
Component: engine
2014-07-04 09:33:53 +01: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
Matthew Heon 9b1af46554 Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
The Docker btrfs graph driver does not interact well with SELinux at present.
If btrfs mounts the same file in several locations, the same SELinux label will
be applied to all mountpoints. In the context of the graph driver, things such
as shared libraries become inaccessible to containers due to SELInux, causing
all dynamically linked applications to fail when run in a container.

Consequently, error when we detect the daemon is being run with SELinux enabled
and the btrfs driver. Documentation has been added for this behavior.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 4318802f645cdd4fa63a894160f153a69a97af59
Component: engine
2014-07-03 08:11:18 -04: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
LK4D4 31988404b5 BroadcastWriter refactoring
It became slightly faster and lighter
possibly fixes #5923 problems

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7bdd23bfeec1968a3061e63e24af049837baf4c4
Component: engine
2014-07-03 10:12:53 +04:00
LK4D4 eec6ca2f45 Benchmark for BroadcastWriter
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: a8d95b7c573dedad26395372dd0d4ff8882f6cb6
Component: engine
2014-07-03 10:06:58 +04:00
unclejack ee3e18ed8e update vendored archive/tar to lower allocations
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b885f61a61df1e8d8f71914e17c2a2861167f96e
Component: engine
2014-07-03 08:28:39 +03: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
James Turnbull 1a0c71351c Minor updates and fixes to the CONTRIBUTING doc
* Fixed some uses of docker v. Docker
* Formatting and line wrapping.
* Spelling errors and grammar fixes.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: d013b76e10262624c9f8ee05b9877e26eb58b516
Component: engine
2014-07-02 22:52:56 -04: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
Fabio Falci 8ae73ea011 Move docker restart tests to integration cli
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 9da6c80533f80060575840e1e2fd80cc11826f7b
Component: engine
2014-07-02 21:56:19 +01:00
Mrunal Patel c4b0fae952 api.DockerCli: Extract pullImage into separate function
This lets us reuse this code later.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 2b3959c414ffe9403e53617ed1a160c1daabeeaa
Component: engine
2014-07-02 16:33:14 -04:00
Alexander Larsson 18c97f39c3 server: Break out setHostConfig() from ContainerStart
This will be reused for ContainerCreate

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a4a80b64a7f6366f7fb94cb8cca042a6324a0e99
Component: engine
2014-07-02 16:32:28 -04:00
LK4D4 4d29e9b718 Move WriteBroadcaster to separate package as BroadcastWriter
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 9d4e80222144c0aef3e78202ecb4904b3ce5ed9b
Component: engine
2014-07-02 23:31:06 +04:00
Victor Vieux aaeea8a0a5 update release checklist and .gitignore
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 170ba7f8feea9b284d20ed85e9ea9c947be2941c
Component: engine
2014-07-02 18:54:14 +00:00
Victor Vieux b8be307cab Merge pull request #6808 from vieux/pr_6806
Add backwards READ compatibility for the old libcontainer API 
Upstream-commit: 8ea35892871f75cd0197a5c443054bf570ed6744
Component: engine
2014-07-02 10:51:27 -07:00
Tibor Vass bc22b11a74 Merge pull request #6780 from unclejack/tweak_cli_integration_tests
Tweak cli integration tests
Upstream-commit: f357b18ee3550a4214d03c10cfe0bed10d6d0df5
Component: engine
2014-07-02 13:16:26 -04:00
unclejack e0255ad153 Merge pull request #6763 from folieadrien/master
Migrate TestGetImagesHistory into unit and CLI test
Upstream-commit: deb57c5144f75dc6e1e73194c86991264048ca4a
Component: engine
2014-07-02 19:44:21 +03:00
Tianon Gravi a17b20aaed Merge pull request #6814 from tianon/more-init-ulimit
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
Upstream-commit: 292483531f269261d6d8b6a98c1a23879b00d851
Component: engine
2014-07-02 10:08:11 -06:00
unclejack 977b717fdd integcli: add & use pullImageIfNotExist for pulls
This speeds up the tag cli integration tests by about 20 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: dad476803719ae2e86c703981caef0462e25260c
Component: engine
2014-07-02 18:45:11 +03:00
Tianon Gravi a3d12bd8ea Add NOFILE and NPROC ulimit settings to the SysV init script
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bae79c3e7285c170f97a0f7f331a48fb47f0f40e
Component: engine
2014-07-02 09:38:19 -06:00
Tianon Gravi 7c15233e4a Add NOFILE and NPROC ulimit settings to the OpenRC init script
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7abe70c0b1018729006fd5d614ada2dc67edb9b2
Component: engine
2014-07-02 09:36:57 -06:00
Victor Vieux ce98881516 fix compilation and panic
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: d403936818b8785b65ff55ebab0d266b4a871ef6
Component: engine
2014-07-02 00:54:08 +00:00
Tibor Vass 356f6ecbf3 Add backwards READ compatibility for the old libcontainer API
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: cccb64e8633eee309e6ce33c3bb41614edd70d81
Component: engine
2014-07-02 00:19:05 +00:00