a0ae4df58b
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 49fd83a25e2e6604014de41d4f4099a7bc07a09b
Component: engine
2015-05-04 09:28:06 -07:00
9eba4b1b6c
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
Upstream-commit: ac324e5e52af1f2489320f3bdb7e2ebbd83ee869
Component: engine
2015-05-04 11:53:05 -04:00
a580a2dfa9
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
Upstream-commit: 2e49281bd085d84babe8b3243de1e97c2d12dac1
Component: engine
2015-05-04 18:35:25 +03:00
778713f3f9
Merge pull request #12953 from sunyuan3/404
...
Verifiy status Codes 404 when no such image.
Upstream-commit: a8d73339f21ae900e84285d02a9c675fc8963cc6
Component: engine
2015-05-04 11:10:07 -04:00
9531505238
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
2015-05-04 10:49:13 -04:00
1232de25e5
Merge pull request #12944 from tianon/fsnotify-1.2.0
...
Update fsnotify to 1.2.0
Upstream-commit: 56f7da34fc0161d2ccbbd2eeb3473ac5f406e0e1
Component: engine
2015-05-04 16:57:45 +03:00
5306450032
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 1be7a10b89506afdcb80f109f323b6e47d2e466c
Component: engine
2015-05-04 21:37:44 +08:00
af54781255
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
Upstream-commit: 175339ffb6c7d6e4c2aa78f01f227643a0d97c42
Component: engine
2015-05-04 16:28:03 +03:00
ad3d66108b
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
2015-05-04 21:11:29 +08:00
12b77cedd1
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 9eefd2c17dd5813f6d471b08473a79c65e235450
Component: engine
2015-05-04 15:39:40 +08:00
830eaf883b
Update the Docker Hub account, org and group documentation and images
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 5cec69a7b3ea12f9595e017eb27826ff9ad2962b
Component: engine
2015-05-04 00:37:54 +00:00
3377b27513
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
Upstream-commit: fe221852b7402ec6734247e67bb5120e4e301390
Component: engine
2015-05-03 15:42:38 -04:00
a0242e0a80
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
Upstream-commit: b40a5eeec8a3db6a6488696f2c58bc4acf0d7dbd
Component: engine
2015-05-03 14:15:17 -04:00
703dea0308
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
Upstream-commit: 15313dfdf38ecaa0dc93005f1c3824491fbb3b96
Component: engine
2015-05-03 11:10:14 -04:00
6fb6ee62f9
Merge pull request #12888 from jmzwcn/patch-3
...
`docker images` friendly duration gets unfriendly after a while
Upstream-commit: e8bbd87ba831dbda27bad452cd367a8e7e34f584
Component: engine
2015-05-03 11:09:25 -04:00
5b22f64f34
docker images friendly duration gets unfriendly after a while
...
fix #12852
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: 28ea4a63d00e9d0e28375adc80d24461193e7a28
Component: engine
2015-05-03 21:19:18 +08:00
c5e187ce2d
Remove empty line after client.CmdInspect docstring #12706
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: 28547a1a3a594ee24b4cb51a89d9fce630c8c066
Component: engine
2015-05-03 17:23:18 +08:00
84315243cc
Update fsnotify to 1.2.0
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: e1ccfabdc5c3163db05327d24c4b2581eeac752c
Component: engine
2015-05-02 23:28:15 -06:00
ba5fba5a8d
Update go-patricia to 2.1.0
...
This includes a fix for the minor v2 API change introduced by https://github.com/tchap/go-patricia/commit/341a37095fea62f400f449e4ec0192702d6e019e . 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b447fef7ecb740bc0f9ece75e10926fc5f121b5c
Component: engine
2015-05-02 23:25:57 -06:00
66f3f4a759
Adding test for "GET /images/(name)/history" API.
...
Closes #12284 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: aaaa8bab0cad495c842580e35322bee8e73de08f
Component: engine
2015-05-02 23:09:32 -04:00
3ce54cf19d
Merge pull request #12893 from vdemeester/12892-fix-labels-documentation
...
Fixing examples given for labels
Upstream-commit: 0ad6f901277638984c89e185bc18a25cb508b25f
Component: engine
2015-05-02 22:29:08 -04:00
81f3cafcc8
Merge pull request #12922 from tianon/complete-repos-on-pull-all
...
Only complete repos with "docker pull -a"
Upstream-commit: b58f48ae42f348f573d7874fa8a29bd816cd821a
Component: engine
2015-05-02 22:19:37 -04:00
809dae68ab
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4aff563282c4d467575aed006642a22d673d4cb7
Component: engine
2015-05-02 15:57:57 +02:00
d6d6bba166
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c7cfdb65aa43a4561adb919d170bba5e86d69bee
Component: engine
2015-05-02 03:12:58 +02:00
ba89828b7c
Rename development builds to be in the "docker-dev" repo instead of "docker"
...
See https://github.com/docker-library/docker/issues/2 for some of the context around this; essentially, we're looking to create an official `docker` image that includes the Docker CLI (and the dependencies necessary for easy Docker-in-Docker), but it makes sense to use the `docker` namespace for that image. The `docker-dev` official image is already builds of Docker's own `Dockerfile` (but specifically of releases), so this seemed like a good fit. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: a4af8ad86963a21865af7aff6a742f43a6341ae4
Component: engine
2015-05-01 18:28:08 -06:00
e0a352671b
Merge pull request #12932 from tianon/finally-remove-archive-tar-copy
...
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
Upstream-commit: 3ea59f8991a4d70254582759044316e522a09ee9
Component: engine
2015-05-01 15:43:13 -07:00
57496db316
Merge pull request #12924 from runcom/provide-struct-to-cli-stream
...
Provide a struct to configure cli streaming
Upstream-commit: 393678474f7364b44e7b26b5e9a99aabf1762724
Component: engine
2015-05-01 15:10:58 -07:00
7bd38d02c2
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
...
IT'S ABOUT TIME. 🎉
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 576985a1dcd76a9af2c5c483e6f12035a1f47b96
Component: engine
2015-05-01 16:01:10 -06:00
9893237498
Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit
...
TestDiffEnsureDockerinitFilesAreIgnored is too long
Upstream-commit: 1f2f3db1e34a72f4b739ce3654fcca7dbe427282
Component: engine
2015-05-01 14:52:34 -07:00
a71a03ee87
Merge pull request #12930 from tianon/build-deb-stretch
...
Add "debian:stretch" as another build-deb target
Upstream-commit: 4d88bf3ecb0cb5c8a9bc7310ce13fc7ea4afd1ad
Component: engine
2015-05-01 14:42:19 -07:00
165f28e440
Merge pull request #12929 from tianon/dockerignore-fffff
...
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
Upstream-commit: e6d3ebd939360ccc51ef987245264631cc3cf788
Component: engine
2015-05-01 14:32:26 -07:00
5de2c67ffe
Merge pull request #12928 from LK4D4/firewalld_race
...
Fix race in FirewalldInit
Upstream-commit: ab74b327c6bf8f3ff19a5394a1912e2322660b58
Component: engine
2015-05-01 14:23:47 -07:00
11438fc8b6
Add "debian:stretch" as another build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: d317b7c89159f9795fa7eb69504191208b3c0b3f
Component: engine
2015-05-01 15:03:08 -06:00
c2d48a3c7b
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
...
Turns out that `-f` on a file that's in `.dockerignore` actually does work. No idea why it wasn't when I was doing this before, but oh well! 🤘
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9f5730e131699caaf6f8f6f941d5942d68295055
Component: engine
2015-05-01 14:45:00 -06:00
c72735069d
Fix race in FirewalldInit
...
It was possible that signalHandler won't start because connections is
not assigned.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a05bcd12c44b4daada51267d89fd9ac53812be02
Component: engine
2015-05-01 13:35:54 -07:00
cad4e1508b
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d9639409fd54ee6955793474fa9a5bac1e583c77
Component: engine
2015-05-01 20:23:44 +02:00
eb1863c913
Merge pull request #12921 from hqhq/hq_fix_rmlink
...
fix docker rm name issue
Upstream-commit: e1df16b3a3f42c77234825fb504a657458a8abba
Component: engine
2015-05-01 11:15:25 -07:00
b42d429d30
Only complete repos with "docker pull -a"
...
With this, `docker pull deb<tab>` will show all `debian:*` tags, as before, but `docker pull -a deb<tab>` will complete directly to just `debian`. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 380b8737523edf1c2575208a14a8673684758692
Component: engine
2015-05-01 10:04:24 -06:00
57ef45bb87
Docs adding uninstall instructions
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 5eee4058feaa7f06348941d267f4d76178ab3de4
Component: engine
2015-05-01 08:10:56 -07:00
96a8cfc20a
fix docker rm name issue
...
Addresses https://github.com/docker/docker/issues/12308
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 79f13d1497b073113f713e903e934dafcf78c42f
Component: engine
2015-05-01 22:26:40 +08:00
fcc891cdff
Merge pull request #12915 from moxiegirl/implement-github-ignores
...
Adding support for GITHUB IGNORES to the engine Dockerfile
Upstream-commit: 7e864a57bcf4fff84a631e83a3c960613c4e4486
Component: engine
2015-05-01 06:29:27 -07:00
63fe58e0de
devmapper: Disable mount option "discard" by default
...
Right now devicemapper mounts thin device using online discards by default
and passes mount option "discard". Generally people discourage usage of
online discards as they can be a drain on performance. Instead it is
recommended to use fstrim once in a while to reclaim the space.
In case of containers, we recommend to keep data volumes separate. So
there might not be lot of rm, unlink operations going on and there might
not be lot of space being freed by containers. So it might not matter
much if we don't reclaim that free space in pool.
User can still pass mount option explicitly using dm.mountopt=discard to
enable discards if they would like to.
So this is more like setting the containers by default for better performance
instead of better space efficiency in pool. And user can change the behavior
if they don't like default behavior.
Reported-by: Mike Snitzer <snitzer@redhat.com >
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 04adaaf1ee1688ff48cb8f541dcb80e965f45080
Component: engine
2015-05-01 09:16:31 -04:00
964532d377
Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver
...
Windows: Move workdir check daemon-side
Upstream-commit: 79d086c47d61f6da522a0e586005a02dae9b5ede
Component: engine
2015-05-01 00:24:40 -04:00
baf4d2dbf5
Merge pull request #12716 from Microsoft/10662-defaultlistener
...
Windows: Change default listener to HTTP
Upstream-commit: abf1a14bfe0a9a384d8551a56a7f555b71ea6662
Component: engine
2015-05-01 00:11:54 -04:00
c1ee29b6e9
Windows: Change default listener to HTTP
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com >
Upstream-commit: cbf9a64cb5f69ce07598646ac26be247c7967cbb
Component: engine
2015-04-30 19:49:45 -07:00
46a5d01a59
Merge pull request #12767 from Microsoft/10662-commitdefertarclose
...
Windows: Commit() rwTar defer close
Upstream-commit: 66077a9d692d8f5b5dd71bc848c359d3df092998
Component: engine
2015-04-30 18:06:09 -07:00
bdf088b5fb
Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
...
Windows: Start refactor execdriver/driver.go
Upstream-commit: e9c9682333499f6a063404ad9df5db1385e75bbf
Component: engine
2015-04-30 20:36:10 -04:00
c15edc1320
Merge pull request #12831 from Microsoft/10662-nolxconwindows
...
Windows: Factor out LXC
Upstream-commit: 6b42d72d86737fa6df102379ec3c9964204dd782
Component: engine
2015-04-30 17:25:15 -07:00
b17cfc7a0a
Merge pull request #12841 from Mashimiao/use-CustomSize-to-replace-intToString
...
use CustomSize replace intToString
Upstream-commit: d2e380b687ddf7fa83ff3a17add41278300926b7
Component: engine
2015-04-30 17:24:41 -07:00
6b9dd0750f
Merge pull request #12901 from hqhq/hq_fix_test_comment
...
fix comments for test certain tests
Upstream-commit: 7e7b6a20bd4ea60954b9d17823bf4af00f27977e
Component: engine
2015-04-30 17:08:23 -07:00
David Calavera
Sebastiaan van Stijn
unclejack
Tibor Vass
Brian Goff
Ma Shimiao
HuKeping
Yuan Sun
Sven Dowideit
James Turnbull
Travis Thieman
Doug Davis
Daniel Zhang
Tianon Gravi
Raghuram Devarakonda
Antonio Murdaca
Jessie Frazelle
Alexander Morozov
Michael Crosby
Alexander Morozov
Megan Kostick
Qiang Huang
moxiegirl
Vivek Goyal
jhowardmsft