0f648e8ecd
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8771cafab65e50d09d3590a7f22758e919b78fe4
Component: engine
2015-05-04 22:41:57 +02:00
e79952cb66
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
Upstream-commit: 3fcf387d52676d9c4f24b7a4d2f48c4992d7485f
Component: engine
2015-05-04 15:51:56 -04:00
f81d4d4161
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
Upstream-commit: 0a2ccb1cb54834d3b97982f93c42671be5861082
Component: engine
2015-05-04 12:48:24 -07:00
069ce566f4
Merge pull request #12967 from runcom/add-self-to-maintainers
...
Add runcom to maintainers.people
Upstream-commit: f93cbd2448fde31a5c0a93b1faba4645c5dd00fd
Component: engine
2015-05-04 12:00:42 -07:00
204fb1504f
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
Upstream-commit: 87a0ca5283aa5b1c3d04cc35e1c415de6b00d323
Component: engine
2015-05-04 14:57:58 -04:00
3660faa6b0
Merge pull request #10775 from duglin/BuilderFlags
...
Add support for Dockerfile CMD options
Upstream-commit: 9c32cd1cef6bd95d6f2a32d18756d6087ad8fa0c
Component: engine
2015-05-04 11:39:09 -07:00
d48ebd70cc
Add runcom to maintainers.people
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ea6649e701cf04b90fcc4a1abb29337d99b7af70
Component: engine
2015-05-04 20:26:11 +02:00
f23ef4fe69
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 815b472a02dc0f593daee4006ce893fe17236b70
Component: engine
2015-05-04 19:56:10 +02:00
366be0f240
Merge pull request #12865 from larsks/bug/12864
...
journald log driver: use CONTAINER_ID field for container id
Upstream-commit: 0c1c2726876bdffad4e600456f07e256bc1361a1
Component: engine
2015-05-04 10:53:58 -07:00
a4975c3e58
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
Upstream-commit: 4895a887e2e88699a07ab6fea9113a5ff13d2450
Component: engine
2015-05-04 13:03:28 -04:00
42096e6c34
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
Upstream-commit: 24bd3db0b5c3368968830f775546ccd03c86c380
Component: engine
2015-05-04 12:58:43 -04:00
85b318b6f3
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
Upstream-commit: 8ac8c2af6040c24a7c8d1f54c4374665b87e69eb
Component: engine
2015-05-04 12:55:46 -04:00
5221178681
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
Upstream-commit: 4f5272320cef76dd33a3895f228e2080d9d3a13b
Component: engine
2015-05-04 09:36:55 -07:00
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
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
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 341a37095f👍
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
