Commit Graph

15724 Commits

Author SHA1 Message Date
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
Tibor Vass e9c9682333 Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
Windows: Start refactor execdriver/driver.go
2015-04-30 20:36:10 -04:00
Michael Crosby 6b42d72d86 Merge pull request #12831 from Microsoft/10662-nolxconwindows
Windows: Factor out LXC
2015-04-30 17:25:15 -07:00
Michael Crosby d2e380b687 Merge pull request #12841 from Mashimiao/use-CustomSize-to-replace-intToString
use CustomSize replace intToString
2015-04-30 17:24:41 -07:00
moxiegirl 7e7b6a20bd Merge pull request #12901 from hqhq/hq_fix_test_comment
fix comments for test certain tests
2015-04-30 17:08:23 -07:00
Michael Crosby 5221fd2ba5 Merge pull request #12900 from gaurav-gosec/master
Make use of iptablesPath variable which has the path of iptables, instea...
2015-04-30 16:12:03 -07:00
Michael Crosby 6bb1986e7f Merge pull request #12914 from duglin/FixCPtext
Don't wrap 'cp' help too soon.
2015-04-30 16:05:20 -07:00
Tibor Vass 648bf6a446 Merge pull request #12909 from runcom/12907-fix-TestApiImagesDelete-net-none-build
Fix TestApiImagesDelete for --net none build
2015-04-30 18:22:04 -04:00
Mary Anthony 51977a2307 Adding support for GITHUB IGNORES to the engine Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-30 15:21:05 -07:00
Doug Davis 68ee5bdf96 Don't wrap 'cp' help too soon.
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.

This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.

The \n made the output look funky.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-30 14:43:14 -07:00
John Howard 10e2dbf375 Windows: Factor out LXC
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:28:35 -07:00
John Howard 71bfb93678 Windows: Fork execdrivers.go for Windows execdriver
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:22:30 -07:00
John Howard b255c565ca Windows: Start refactor execdriver/driver.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:21:04 -07:00
John Howard 03eb0d065d Windows: Move workdir check daemon-side
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:16:45 -07:00
John Howard f9c7772b83 Windows: Commit() rwTar defer close
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 12:17:33 -07:00
jhowardmsft 86d1223a29 Windows: mkdirall volume path aware
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
2015-04-30 11:59:42 -07:00
Antonio Murdaca 5c86f311c8 Fix TestApiImagesDelete for --net none build
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 20:49:28 +02:00
Alexander Morozov 72e9e12fa0 Merge pull request #12592 from Mic92/dockerfile
Dockerfile: download go libraries before copy vendor
2015-04-30 10:29:01 -07:00
moxiegirl cacf90c963 Merge pull request #12857 from nikolas/patch-1
Remove incorrect option in docker install command
2015-04-30 09:35:20 -07:00
Tibor Vass 0d0b42547e Merge pull request #12771 from runcom/say-bye-to-engine
Remove engine
2015-04-30 12:18:16 -04:00