Tibor Vass
e6272cf4e9
Merge pull request #6666 from erikh/fix-escaping-whitespace
...
fix whitespace that precedes the escape in a multiline string.
Upstream-commit: b85f20cf1311e4b654cdb48781d16533e66b7013
Component: engine
2014-06-25 17:03:19 -04:00
Erik Hollensbe
4526ee08e7
fix whitespace that precedes the escape in a multiline string.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
2014-06-25 13:39:47 -07:00
Christian Berendt
bc88f8248d
Add a step to verify if Docker is working as expected
...
Like in the other installation guides I added a simple test
to verify that importing images and starting containers is
working.
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: f3ea94a79775b30b7338a3fc99923978b260af28
Component: engine
2014-06-25 21:57:54 +02:00
Christian Berendt
8a88644313
Import public GPG key after adding the openSUSE repository
...
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: 0b2b3221e21c8c6947585481ad476d57653ade28
Component: engine
2014-06-25 21:53:45 +02:00
LK4D4
bc0ef19fac
Combined AddGet benchmark
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 04a9fe1e62345d282985724b9eb0cd7446c08449
Component: engine
2014-06-25 22:49:38 +04:00
Tibor Vass
2ab25c0f86
add integration test for --workdir=/
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: baacc7006b35badb2e9ba807451ab158936d7832
Component: engine
2014-06-25 11:02:59 -04:00
Tibor Vass
3325b6e290
fix bug in FollowSymlinkInScope when link == root
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e
Component: engine
2014-06-25 11:02:59 -04:00
Tibor Vass
bb9a141a59
improve untar when using files instead of directories. Specifies behavior on non-existant targets.
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 1c8d3106df0bd2aba304c7b3863949ca11c2b133
Component: engine
2014-06-25 09:35:26 -04:00
Matthew Heon
a8f5e76a89
Update documentation noting that SIGCHLD is not proxied.
...
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: be4f4599a6d2a517e615dc1f64527a3f2ad2f683
Component: engine
2014-06-25 09:08:02 -04:00
Erik Hollensbe
053aa6d8a6
Add ticks to docker links userguide, was not being rendered properly, fix spelling error in /etc/hosts
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 6b2901954107c438d8e92dc6f595ec9bcd179777
Component: engine
2014-06-25 02:18:16 -07:00
hyeongkyu.lee
64d580f03b
Update dockervolumes.md
...
~~~
kyu@kyu-HP-EliteBook-2570p:~/apps/docker/volume$ docker run -v /dbdata --name dbdata2 ubuntu
2014/06/25 14:17:44 Error response from daemon: No command specified
~~~
Upstream-commit: 9026888b109e6dd1042259ffd9e707d9e5f76d34
Component: engine
2014-06-25 14:53:59 +09:00
Alexandr Morozov
e76ace6106
Add benchmarks on TrucnIndex.Delete
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 7c8445826fdce3e46253a6e194a33407ed9bd154
Component: engine
2014-06-25 09:37:39 +04:00
James Turnbull
5252b72a99
Merge pull request #6656 from andersryanc/master
...
Remove Docs viewport tag to fix iPhone scaling
Upstream-commit: 01d4fd76dd60a24b24adbb8bb85623738c7636a9
Component: engine
2014-06-24 20:16:47 -07:00
Victor Vieux
9328b2b9ef
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b18c72155530aef29028694d7a92d97440c04a78
Component: engine
2014-06-25 01:44:48 +00:00
Sven Dowideit
1561a70302
Merge pull request #6658 from amuino/doc_pause_unpause
...
Document the pause and unpause commands available on API v1.12 onwards
Upstream-commit: 11902d4ccbfe0b988f66c45b4b303d3fffad62b7
Component: engine
2014-06-25 10:00:36 +10:00
Victor Vieux
f9d60717da
Merge pull request #6659 from vieux/pr_6248
...
Change floats to ints recursively on env encoding
Upstream-commit: c72cfa8d45f8b9c3eff7f0d5b56592605dd9dc77
Component: engine
2014-06-24 16:51:28 -07:00
LK4D4
5281f733c2
Change floats to ints recursively on env encoding
...
Fixes #6246
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1d3d1c5d2b762a32fbee348702af96f9c00fff83
Component: engine
2014-06-24 23:39:26 +00:00
Michael Crosby
b8473175aa
Merge pull request #6651 from erikh/6002-conflicting-iptables-options
...
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
Upstream-commit: e8997002545c2dcce476f296cf2693c98539a828
Component: engine
2014-06-24 15:56:05 -07:00
Erik Hollensbe
58acc86336
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 05f293e65eeb7d1c86ba5644ed8d682aaeddd53d
Component: engine
2014-06-24 15:49:35 -07:00
Abel Muiño
f728e9c8d0
Document the pause and unpause commands available on API v1.12 onwards
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
Upstream-commit: 901a47daff63a4a7f22cbe556741081334c76572
Component: engine
2014-06-25 00:41:57 +02:00
Ryan Anderson
18efee874d
Remove viewport tag to fix iPhone scaling
...
Upstream-commit: 7b1dd54d5d29b5d15e2081cc21b836a1907162cf
Component: engine
2014-06-24 15:16:40 -07:00
Tibor Vass
a65bf57706
Merge pull request #6654 from vieux/fix_test_search
...
Fix search integration-cli test
Upstream-commit: 4f5e91e3b4fdbd29947ac9543f0352545b457e02
Component: engine
2014-06-24 17:51:07 -04:00
Sven Dowideit
909b3a8ba8
Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs
...
move the man pages to the docs/ dir
Upstream-commit: 11ef08402a5b8d39b1ec3fe004aa1d4b4c0ca5b3
Component: engine
2014-06-25 07:50:09 +10:00
Victor Vieux
06a813f16e
Merge pull request #6643 from kzys/freebsd-cp
...
cp's -T and --reflink=auto are only available on GNU coreutils
Upstream-commit: 6d8e95557cd63b6e8302255d6e070f24d7c2e6d5
Component: engine
2014-06-24 14:29:18 -07:00
Victor Vieux
d6e6af197e
Fix search integration-cli test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: dd258553b1cbe58d0cb4f8d505aea6f3b1ae6543
Component: engine
2014-06-24 21:16:34 +00:00
Michael Crosby
3d6c57f495
Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor
...
Update libcontainer dep to 5210a236b92a8022a673108f347
Upstream-commit: 408963ed4d4ea5ffca99c08b3e22bf720eb19b88
Component: engine
2014-06-24 13:51:04 -07:00
unclejack
7c1e43e819
Merge pull request #6595 from LK4D4/env_benchmarks
...
Benchmarks for engine/env
Upstream-commit: 1059e166fd4fbe88a05f182139b6fc5fc95ab6b3
Component: engine
2014-06-24 23:35:00 +03:00
unclejack
df9f902ba5
Merge pull request #6648 from LK4D4/truncindex_bench
...
Truncindex benchmarks
Upstream-commit: c4dbd4f7c0ff3f33705db21a709c3475ebe0770b
Component: engine
2014-06-24 22:10:33 +03:00
Tibor Vass
126ec1c58c
Merge pull request #6216 from gsalgado/convert-integration-tests
...
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
Upstream-commit: f6d11c8d50387472fd7e34eea66b79237238c321
Component: engine
2014-06-24 14:53:10 -04:00
Victor Vieux
986327e6e1
return 304 is status isn't modified in start and stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
2014-06-24 18:31:56 +00:00
Michael Crosby
0daa61f085
Rename libcontainer.Container to libcontainer.Config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 1dc8e2ffab795f4999a122b4a576d54e03c7c61a
Component: engine
2014-06-24 11:31:03 -07:00
Michael Crosby
d4e9300e80
Update libcontainer references
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: cee6f4506c79c6fc21769d427ac4dd51c28450c3
Component: engine
2014-06-24 11:31:03 -07:00
Michael Crosby
060053e75d
Update libcontainer to 5210a236b92a8022a673108f347
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 423a8f91d72f5def754ec3a8efe000aa70bc6f22
Component: engine
2014-06-24 11:30:36 -07:00
LK4D4
a93d5dc92d
Benchmarks for engine/env
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 01b424028ed0ab7d673c7ae2221457ae12304557
Component: engine
2014-06-24 21:48:16 +04:00
LK4D4
c72045b105
Improve truncindex benchmarks
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 7eb425ccd167487b8424ff680e46216d99fa237a
Component: engine
2014-06-24 21:41:51 +04:00
Victor Vieux
ae52a1306d
Merge pull request #5413 from SvenDowideit/docker-info-list-sockets
...
Add Sockets (-H) list to `docker -D info`.
Upstream-commit: e23e3a1600e1b9178771557a843ed6e0c979f78c
Component: engine
2014-06-24 10:40:53 -07:00
LK4D4
1ce22444ec
Move truncindex in separate package in pkg/
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ed032ddfd68a8654671a13d676c0f7539e36a10b
Component: engine
2014-06-24 21:19:15 +04:00
Mike Snitzer
bda9d074fe
devmapper: remove extra space in DefaultThinpBlockSize assignment
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: f9c078ef38106d00de7774374f3ac71bb0d562d3
Component: engine
2014-06-24 12:43:45 -04:00
Mike Snitzer
e00d89f257
devmapper: Add option for specifying the thin pool blocksize
...
Add dm.blocksize option that you can use with --storage-opt to set a
specific blocksize for the thin provisioning pool.
Also change the default dm-thin-pool blocksize from 64K to 512K. This
strikes a balance between the desire to have smaller blocksize given
docker's use of snapshots versus the desire to have more performance
that comes with using a larger blocksize. But if very small files will
be used on average the user is encouraged to override this default.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 09ee269d998ad04733ef577739fa051df9d3f12e
Component: engine
2014-06-24 12:10:28 -04:00
Mike Snitzer
d61150b2d4
devmapper: use RAMInBytes() rather than FromHumanSize()
...
Device Mapper needs device sizes in binary (1024) multiples. Otherwise
kernel checks can find that the specified thin-pool device sizes aren't
a multiple of the specified thin-pool blocksize.
The name for "RAMInBytes" is likely too narrow given the new consumers
but... Also add "tebibyte" support to RAMInBytes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 2470a5ed999d9dc8d4b9bd250727ac13964db5b3
Component: engine
2014-06-24 12:10:14 -04:00
Guilherme Salgado
403b31a70b
Migrate TestGetEvents into a unit and a CLI test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: 1c291ccbbe91b8d8ff3fefb439b20306fd0af2b7
Component: engine
2014-06-24 17:43:26 +02:00
Mike Snitzer
157a125d05
devmapper: fix reloadPool() to also specify '1 skip_block_zeroing'
...
createPool() and reloadPool() should be consistent with the thin-pool
table params they use.
Since createPool() specifies '1 skip_block_zeroing' reloadPool() should
too. Otherwise, if the pool is reloaded (as is done when resizing
loopback devices) block zeroing will be enabled after the reload
completes.
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: d420134fa2ea8ceedf2a9a64263d09b308263c2c
Component: engine
2014-06-24 11:23:13 -04:00
Kato Kazuyoshi
7622154038
cp's -T and --reflink=auto are only available on GNU coreutils
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 733711481ee665564f0f2a77d100353d5f9c82e2
Component: engine
2014-06-24 23:58:17 +09:00
kyu
c16ee9f478
Update dockervolumes.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: a51dc92379f6d647fa4c259c3d1d30d01852a580
Component: engine
2014-06-24 18:36:57 +09:00
Jonathan Camp
28d12ecd02
Replace dashes in link name with underscores
...
Docker-DCO-1.1-Signed-off-by: Jonathan Camp <jonathan@irondojo.com > (github: kung-foo)
Upstream-commit: 6e74754a504e80378ed56ec765d62b762f80fcb4
Component: engine
2014-06-24 09:04:02 +02:00
James Turnbull
6a56f20a85
Merge pull request #6633 from SvenDowideit/avoid-extra-gravatar-download
...
Lets not download the gravatar and then download a different one after t...
Upstream-commit: f1ac8962f995d650ec10b04b055c8bbb0db4bec4
Component: engine
2014-06-23 23:58:15 -07:00
Senthil Kumar Selvaraj
417ba2a8cb
Fix typo in README.md
...
Upstream-commit: 21e258d7328e56fd451e6ed0324cff094ec70798
Component: engine
2014-06-24 11:57:24 +05:30
SvenDowideit
b1bafb1f84
Add Fred as docs MAINTAINER
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 87d522a5576125515274022d0b49e7bdc2942d18
Component: engine
2014-06-24 15:45:44 +10:00
SvenDowideit
d6876fe608
Lets not download the gravatar and then download a different one after the js is triggered
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: c7a1bdf6c039c41877c007ab44902f084860ede0
Component: engine
2014-06-24 14:48:29 +10:00
SvenDowideit
b873d0d1bc
move the man pages to the docs/ dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 42be6f2957c945e070079ec773e29b356a9f9452
Component: engine
2014-06-24 13:07:42 +10:00
Tibor Vass
Erik Hollensbe
Christian Berendt
LK4D4
Matthew Heon
hyeongkyu.lee
James Turnbull
Victor Vieux
Sven Dowideit
Victor Vieux
Michael Crosby
Abel Muiño
Ryan Anderson
unclejack
Mike Snitzer
Guilherme Salgado
Kato Kazuyoshi
kyu
Jonathan Camp
Senthil Kumar Selvaraj
SvenDowideit