Tianon Gravi
ca8fa6e46d
Allow download-frozen-image.sh to work on user images too
...
To account for "/" not working in filenames, we replace it with "_" for our temporary files (that exist only to emulate Bash 4's associative arrays in Bash 3).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-06 12:05:17 -06:00
Phil Estes
4895a887e2
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
2015-05-04 13:03:28 -04:00
Phil Estes
24bd3db0b5
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
2015-05-04 12:58:43 -04:00
Tibor Vass
8ac8c2af60
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
2015-05-04 12:55:46 -04:00
Alexander Morozov
4f5272320c
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
2015-05-04 09:36:55 -07:00
Sebastiaan van Stijn
ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
unclejack
2e49281bd0
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
2015-05-04 18:35:25 +03:00
Tibor Vass
a8d73339f2
Merge pull request #12953 from sunyuan3/404
...
Verifiy status Codes 404 when no such image.
2015-05-04 11:10:07 -04:00
unclejack
56f7da34fc
Merge pull request #12944 from tianon/fsnotify-1.2.0
...
Update fsnotify to 1.2.0
2015-05-04 16:57:45 +03:00
Ma Shimiao
1be7a10b89
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-04 21:37:44 +08:00
unclejack
175339ffb6
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
2015-05-04 16:28:03 +03:00
HuKeping
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
Yuan Sun
9eefd2c17d
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-05-04 15:39:40 +08:00
James Turnbull
fe221852b7
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
2015-05-03 15:42:38 -04:00
Travis Thieman
b40a5eeec8
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2015-05-03 14:15:17 -04:00
Doug Davis
15313dfdf3
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
2015-05-03 11:10:14 -04:00
Doug Davis
e8bbd87ba8
Merge pull request #12888 from jmzwcn/patch-3
...
`docker images` friendly duration gets unfriendly after a while
2015-05-03 11:09:25 -04:00
Daniel Zhang
28ea4a63d0
docker images
friendly duration gets unfriendly after a while
...
fix #12852
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2015-05-03 21:19:18 +08:00
jmzwcn
28547a1a3a
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>
2015-05-03 17:23:18 +08:00
Tianon Gravi
e1ccfabdc5
Update fsnotify to 1.2.0
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-02 23:28:15 -06:00
Tianon Gravi
b447fef7ec
Update go-patricia to 2.1.0
...
This includes a fix for the minor v2 API change introduced by 341a37095f
. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-02 23:25:57 -06:00
Raghuram Devarakonda
aaaa8bab0c
Adding test for "GET /images/(name)/history" API.
...
Closes #12284 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-05-02 23:09:32 -04:00
Sebastiaan van Stijn
0ad6f90127
Merge pull request #12893 from vdemeester/12892-fix-labels-documentation
...
Fixing examples given for labels
2015-05-02 22:29:08 -04:00
Sebastiaan van Stijn
b58f48ae42
Merge pull request #12922 from tianon/complete-repos-on-pull-all
...
Only complete repos with "docker pull -a"
2015-05-02 22:19:37 -04:00
Alexander Morozov
ec534042aa
Merge pull request #12941 from runcom/unused-return-error
...
Remove unused error return
2015-05-02 09:12:59 -07:00
Antonio Murdaca
4aff563282
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 15:57:57 +02:00
Antonio Murdaca
c7cfdb65aa
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 03:12:58 +02:00
Tianon Gravi
a4af8ad869
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>
2015-05-01 18:28:08 -06:00
Jessie Frazelle
3ea59f8991
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!
2015-05-01 15:43:13 -07:00
Alexander Morozov
393678474f
Merge pull request #12924 from runcom/provide-struct-to-cli-stream
...
Provide a struct to configure cli streaming
2015-05-01 15:10:58 -07:00
Tianon Gravi
576985a1dc
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>
2015-05-01 16:01:10 -06:00
Jessie Frazelle
1f2f3db1e3
Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit
...
TestDiffEnsureDockerinitFilesAreIgnored is too long
2015-05-01 14:52:34 -07:00
Jessie Frazelle
4d88bf3ecb
Merge pull request #12930 from tianon/build-deb-stretch
...
Add "debian:stretch" as another build-deb target
2015-05-01 14:42:19 -07:00
Michael Crosby
e6d3ebd939
Merge pull request #12929 from tianon/dockerignore-fffff
...
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
2015-05-01 14:32:26 -07:00
Michael Crosby
ab74b327c6
Merge pull request #12928 from LK4D4/firewalld_race
...
Fix race in FirewalldInit
2015-05-01 14:23:47 -07:00
Tianon Gravi
d317b7c891
Add "debian:stretch" as another build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-01 15:03:08 -06:00
Tianon Gravi
9f5730e131
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>
2015-05-01 14:45:00 -06:00
Alexander Morozov
a05bcd12c4
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>
2015-05-01 13:35:54 -07:00
Antonio Murdaca
d9639409fd
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-01 20:23:44 +02:00
Michael Crosby
e1df16b3a3
Merge pull request #12921 from hqhq/hq_fix_rmlink
...
fix docker rm name issue
2015-05-01 11:15:25 -07:00
Tianon Gravi
380b873752
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>
2015-05-01 10:04:24 -06:00
moxiegirl
949b929a32
Merge pull request #12882 from kostickm/12824-uninstall-docs
...
Docs adding uninstall instructions
2015-05-01 08:54:59 -07:00
Megan Kostick
5eee4058fe
Docs adding uninstall instructions
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-05-01 08:10:56 -07:00
Qiang Huang
79f13d1497
fix docker rm name issue
...
Addresses https://github.com/docker/docker/issues/12308
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-01 22:26:40 +08:00
moxiegirl
7e864a57bc
Merge pull request #12915 from moxiegirl/implement-github-ignores
...
Adding support for GITHUB IGNORES to the engine Dockerfile
2015-05-01 06:29:27 -07:00
Vivek Goyal
04adaaf1ee
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>
2015-05-01 09:16:31 -04:00
Tibor Vass
79d086c47d
Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver
...
Windows: Move workdir check daemon-side
2015-05-01 00:24:40 -04:00
Tibor Vass
abf1a14bfe
Merge pull request #12716 from Microsoft/10662-defaultlistener
...
Windows: Change default listener to HTTP
2015-05-01 00:11:54 -04:00
jhowardmsft
cbf9a64cb5
Windows: Change default listener to HTTP
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
2015-04-30 19:49:45 -07:00
Michael Crosby
66077a9d69
Merge pull request #12767 from Microsoft/10662-commitdefertarclose
...
Windows: Commit() rwTar defer close
2015-04-30 18:06:09 -07:00