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
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
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
4c52272a2d
Merge pull request #6818 from vieux/bump_v1.1.0
...
Bump v1.1.0
2014-07-03 10:57:44 -07:00
4318802f64
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)
2014-07-03 08:11:18 -04:00
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
7bdd23bfee
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)
2014-07-03 10:12:53 +04:00
a8d95b7c57
Benchmark for BroadcastWriter
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-07-03 10:06:58 +04:00
b885f61a61
update vendored archive/tar to lower allocations
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-03 08:28:39 +03:00
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
d013b76e10
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)
2014-07-02 22:52:56 -04:00
79812e3646
Bump version to v1.1.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-03 01:15:11 +00:00
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
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
9fe95f1c5b
Merge pull request #6824 from fredlf/1-1_release_notes
...
Added Release Notes
2014-07-03 10:45:11 +10:00
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
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
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
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
2c32c195d9
Merge pull request #6790 from SvenDowideit/pr_out_update_cli_md
...
update cli.md
2014-07-02 17:24:53 -07:00
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
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
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
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
9da6c80533
Move `docker restart` tests to integration cli
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-07-02 21:56:19 +01:00
2b3959c414
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)
2014-07-02 16:33:14 -04:00
a4a80b64a7
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)
2014-07-02 16:32:28 -04:00
9d4e802221
Move WriteBroadcaster to separate package as BroadcastWriter
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-07-02 23:31:06 +04:00
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
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
f357b18ee3
Merge pull request #6780 from unclejack/tweak_cli_integration_tests
...
Tweak cli integration tests
2014-07-02 13:16:26 -04:00
deb57c5144
Merge pull request #6763 from folieadrien/master
...
Migrate TestGetImagesHistory into unit and CLI test
2014-07-02 19:44:21 +03:00
292483531f
Merge pull request #6814 from tianon/more-init-ulimit
...
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
2014-07-02 10:08:11 -06:00
dad4768037
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)
2014-07-02 18:45:11 +03:00
bae79c3e72
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)
2014-07-02 09:38:19 -06:00
7abe70c0b1
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)
2014-07-02 09:36:57 -06:00
d403936818
fix compilation and panic
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-02 00:54:08 +00:00
cccb64e863
Add backwards READ compatibility for the old libcontainer API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-02 00:19:05 +00:00
5ff18b8155
Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms
...
expand to 'used b2d vm on any of the platforms'
2014-07-01 16:09:38 -07:00
b0824edc7c
Merge pull request #6748 from LK4D4/increase_max_patricia_prefix
...
Increase max patricia prefix
2014-07-01 19:03:30 -04:00
96e2bfe28a
Merge pull request #6781 from anweiss/6738-dscarticle
...
Add Article for PowerShell DSC
2014-07-01 15:48:19 -07:00
a52d90a100
Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-world
...
removing the exclaimation mark from our hello-world examples, some users...
2014-07-01 18:10:17 -04:00
a09f99b8b0
Lowercase world, because its not important.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-01 15:07:48 -07:00
3091d9a31e
removing the exclaimation mark from our hello-world examples, some users get trapped by the shell
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-01 15:07:48 -07:00
91c4fbb7bf
convert OSX into OS X
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-01 15:00:34 -07:00
84990731f7
expand to 'used b2d vm on any of the platforms'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-01 15:00:34 -07:00
fc4c0d9de4
Update usingdocker.md
...
boot2docker on windows also uses an IP of its own.
Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu> (github: SvenDowideit)
2014-07-01 15:00:34 -07:00
49d49ac98f
Merge pull request #6803 from vieux/pr_6176
...
Implement tail for docker logs
2014-07-01 14:59:37 -07:00
e06d533cc2
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-01 21:59:08 +00:00
5c344dca4b
add DSC article
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
2014-07-01 17:32:55 -04:00
Victor Vieux
Victor Vieux
Matthew Heon
James Turnbull
LK4D4
unclejack
Sven Dowideit
SvenDowideit
Fred Lifton
Adrien Folie
Fabio Falci
Mrunal Patel
Alexander Larsson
Tibor Vass
unclejack
Tianon Gravi
Tom Maaswinkel
Andrew Weiss