summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Skip TestPullVerifiedfix-ben-redirectArnaud Porterie2015-04-171-0/+2
| | | | | Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com> (cherry picked from commit 9a4fa9c19167756cf39a4d002efe81d4bcd3bb75)
* Remove registry redirectBen Firshman2015-04-171-2/+1
| | | | | | | ... it was causing an infinite redirect. Signed-off-by: Ben Firshman <ben@firshman.co.uk> (cherry picked from commit 4c6d5e3a25557b2a053e8f8e5aafc84f5f6aada8)
* Merge pull request #11635 from jfrazelle/bump_v1.6.0Jessie Frazelle2015-04-16929-44173/+35412
|\ | | | | Bump v1.6.0
| * Bump version to v1.6.0v1.6.0Jessica Frazelle2015-04-162-1/+21
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * for 1.6Mary Anthony2015-04-162-4/+5
| | | | | | | | | | Signed-off-by: Mary Anthony <mary@docker.com> (cherry picked from commit f44aa3b1fbe5e042fee0fb78507ebac35eca3d04)
| * In with the old menu layoutMary Anthony2015-04-155-16/+42
| | | | | | | | | | Signed-off-by: Mary Anthony <mary@docker.com> (cherry picked from commit fe8fb24b530016e56ab584526c093daccacf6040)
| * Adding environment variables for sub projectsMary Anthony2015-04-151-25/+35
| | | | | | | | | | | | | | | | Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com> (cherry picked from commit ef8b917fac0b3d98146cadd890234d9179ae2021)
| * Updating with man pages for distributionMary Anthony2015-04-159-46/+78
| | | | | | | | | | | | | | | | Went through the man pages to update for the v2 instance. Checked against the commands. Signed-off-by: Mary Anthony <mary@docker.com> (cherry picked from commit b6d55ebcbc93ce66aa9906aa87e1081f21ba1650)
| * Ensure state is destroyed on daemont restartMichael Crosby2015-04-152-21/+6
| | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit a5f7c4aa31fa1ee2a3bebf4d38f5fda7a4a28a0d)
| * Inspect show right LogPath in json-file driverDeng Guangxing2015-04-152-1/+5
| | | | | | | | | | Signed-off-by: Deng Guangxing <dengguangxing@huawei.com> (cherry picked from commit acf025ad1b806fd9b5eb3358a8e1d75c6aae890d)
| * Change syslog format and facilityDarren Shepherd2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | This patch changes two things 1. Set facility to LOG_DAEMON 2. Remove ": " from tag so that the tag + pid become a single column in the log Signed-off-by: Darren Shepherd <darren@rancher.com> (cherry picked from commit 05641ccffc5088a382fa3bfb21f1276ccb6c1fc0)
| * try to modprobe bridgeJessica Frazelle2015-04-151-0/+8
| | | | | | | | | | Signed-off-by: Jessica Frazelle <jess@docker.com> (cherry picked from commit b3867b889960604904a4afbab6450bb9528afe06)
| * Prevent Upstart post-start stanza from hangingLewis Marshall2015-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Once the job has failed and is respawned, the status becomes `docker respawn/post-start` after subsequent failures (as opposed to `docker stop/post-start`), so the post-start script needs to take this into account. I could not find specific documentation on the job transitioning to the `respawn/post-start` state, but this was observed on Ubuntu 14.04.2. Signed-off-by: Lewis Marshall <lewis@lmars.net> (cherry picked from commit 302e3834a0bfa860f9d06b42a2955b0cbd135c38)
| * Get process list after PID 1 deadAlexander Morozov2015-04-132-15/+54
| | | | | | | | | | | | | | Fix #11087 Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit ac8bd12b39d39a9361adc174bdff7837e771460d)
| * move syslog-tag to syslog.New functionDeng Guangxing2015-04-131-12/+3
| | | | | | | | | | | | Signed-off-by: Deng Guangxing <dengguangxing@huawei.com> Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 4f91a333d5c9d66ce109c36e7261dbfd3382ebbf)
| * Turned off Ctrl+C processing by Windows shellBrendan Dixon2015-04-103-5/+25
| | | | | | | | | | Signed-off-by: Brendan Dixon <brendand@microsoft.com> (cherry picked from commit c337bfd2e0b0293dbca478a13c29a469493782eb)
| * Allow SEO crawling from docs siteNathan LeClaire2015-04-101-4/+11
| | | | | | | | | | | | | | | | Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com> Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com> (github: nathanleclaire) (cherry picked from commit de03f4797b614fb192a72c83812c2a04a1939c87)
| * Commonalize more bits of install.sh (especially standardizing around "cat ↵Tianon Gravi2015-04-101-49/+63
| | | | | | | | | | | | | | <<-EOF") Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com> (cherry picked from commit 6842bba163de753a5ff3ddbaf9b408c89235022b)
| * Wrap installer in a functionEric Windisch2015-04-101-192/+195
| | | | | | | | | | | | | | | | | | This will assure that the install script will not begin executing until after it has been downloaded should it be utilized in a 'curl | bash' workflow. Signed-off-by: Eric Windisch <eric@windisch.us> (cherry picked from commit fa961ce0463ebd738da875c3a6da8171373d7723)
| * add centos to supported distrosAaron Welch2015-04-101-1/+1
| | | | | | | | | | Signed-off-by: Aaron Welch <welch@packet.net> (cherry picked from commit a6b8f2e3fe4bdc0db8b526bff8b91bb1bd3a7bde)
| * Corrected int16 overflow and buffer sizesBrendan Dixon2015-04-101-25/+26
| | | | | | | | | | Signed-off-by: Brendan Dixon <brendand@microsoft.com> (cherry picked from commit a264e1e83debfaefcb99f5554b8eda9c088a09d1)
| * Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44Alexander Morozov2015-04-0711-41/+149
| | | | | | | | | | | | | | Fix #12130 Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit 2f853b94931057d8ebcd6e21f7656d3a04e2acf4)
| * Test case for network mode chain container -> container -> hostAlexander Morozov2015-04-071-0/+29
| | | | | | | | | | | | | | Issue #12130 Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit ce69dafe4d0424ddb5df53d9aee7728f0734cce7)
| * Swap width/height in GetWinsize and monitorTtySizeAhmet Alp Balkan2015-04-062-5/+5
| | | | | | | | | | Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com> (cherry picked from commit 6e44246fed43341938a41c6db9b115e1e64d332a)
| * Windows console fixesBrendan Dixon2015-04-062-117/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | Corrected integer size passed to Windows Corrected DisableEcho / SetRawTerminal to not modify state Cleaned up and made routines more idiomatic Corrected raw mode state bits Removed duplicate IsTerminal Corrected off-by-one error Minor idiomatic change Signed-off-by: Brendan Dixon <brendand@microsoft.com> (cherry picked from commit 1a36a113d4afc11151c80b111d7357b7c31be32b)
| * docs: Add new windows installation tutorialsAhmet Alp Balkan2015-04-031-1/+8
| | | | | | | | | | | | | | | | | | Updated Windows installation documentation with newest screencasts and Chocolatey instructions to install windows client CLI. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com> (cherry picked from commit 2b320a230979c3222162567b9d1d3193b0806cd5)
| * Update libcontainaer to d00b8369852285d6a830a8d3b9Michael Crosby2015-04-029-40/+96
| | | | | | | | | | | | | | | | | | | | | | Fixes #12015 Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit d12fef1515cb3f0938ea6ed8cab8351e2df2753e) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * Return closed channel if oom notification failsMichael Crosby2015-04-011-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When working with Go channels you must not set it to nil or else the channel will block forever. It will not panic reading from a nil chan but it blocks. The correct way to do this is to create the channel then close it as the correct results to the caller will be returned. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 7061a993c5b620d6e68450f1b90f3458bfa1add0) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Fix panic in integration testsAlexander Morozov2015-03-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Closing activationLock only if it's not closed already. This is needed only because integration tests using docker code directly and doesn't care about global state. Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit c71747571458bf992c729c483c9509e8182d630b) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Avoid ServeApi race conditionDarren Shepherd2015-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If job "acceptconnections" is called before "serveapi" the API Accept() method will hang forever waiting for activation. This is due to the fact that when "acceptconnections" ran the activation channel was nil. Signed-off-by: Darren Shepherd <darren@rancher.com> (cherry picked from commit 8f6a14452dfd88aedc8ac9577a98c38a555baadc) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * graphdriver: promote overlay above vfsVincent Batts2015-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's about time to let folks not hit 'vfs', when 'overlay' is supported on their kernel. Especially now that v3.18.y is a long-term kernel. Signed-off-by: Vincent Batts <vbatts@redhat.com> (cherry picked from commit 2c72ff1dbfa83aa8f797bdfebaacb8a919677326) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Fix progress reader output on closeDerek McGowan2015-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently the progress reader won't close properly by not setting the close size. fixes #11849 Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) (cherry picked from commit aa3083f577224ad74384f648b17c1474ab47b44f) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Use getResourcePath insteadBrian Goff2015-03-312-29/+26
| | | | | | | | | | | | | | | | | | | | | | Also cleans up tests to not shell out for file creation. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 63708dca8a633d68f9342eebd4f7a616e8c48234) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Fix create volume in a directory which is a symbolic linkLei Jitang2015-03-312-3/+42
| | | | | | | | | | | | | | Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit 7583b491250beac9caeeac13b7b68c4e0f03eb60) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Initialize portMapper in RequestPort tooAlexander Morozov2015-03-311-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api requesting port for daemon before init_networkdriver called. Problem is that now initialization of api depends on initialization of daemon and their intializations runs in parallel. Proper fix will be just do it sequentially. For now I don't want refactor it, because it can bring additional problems in 1.6.0. Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit 584180fce7ad11516a256b8abd4621138337e918) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * container: Do not remove contianer if any of the resource failed cleanupVivek Goyal2015-03-313-20/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not remove container if any of the resource could not be cleaned up. We don't want to leak resources. Two new states have been created. RemovalInProgress and Dead. Once container is Dead, it can not be started/restarted. Dead container signifies the container where we tried to remove it but removal failed. User now needs to figure out what went wrong, corrent the situation and try cleanup again. RemovalInProgress signifies that container is already being removed. Only one removal can be in progress. Also, do not allow start of a container if it is already dead or removal is in progress. Also extend existing force option (-f) to docker rm to not return an error and remove container from user view even if resource cleanup failed. This will allow a user to get back to old behavior where resources might leak but atleast user will be able to make progress. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> (cherry picked from commit 40945fc186067e5b7edd1f6cd7645ff2ae7cea6c) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * Ensure that bridge driver does not use global mappersMichael Crosby2015-03-315-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has a few hacks in it but it ensures that the bridge driver does not use global state in the mappers, atleast as much as possible at this point without further refactoring. Some of the exported fields are hacks to handle the daemon port mapping but this results in a much cleaner approach and completely remove the global state from the mapper and allocator. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit d8c628cf082a50c0a2a5e381a21da8279a5462b4) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Refactor port allocator to not have ANY global stateMichael Crosby2015-03-312-91/+73
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 43a50b06187e324e43b26003cace0f351a5fb78c) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * Refactor portmapper to remove ALL global stateMichael Crosby2015-03-312-10/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 62522c98539e1591017cf0d4f28e6a58f3b1ec6b) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Refactor global portallocator and portmapper statePaul Bellamy2015-03-313-67/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continuation of: #11660, working on issue #11626. Wrapped portmapper global state into a struct. Now portallocator and portmapper have no global state (except configuration, and a default instance). Unfortunately, removing the global default instances will break ```api/server/server.go:1539```, and ```daemon/daemon.go:832```, which both call the global portallocator directly. Fixing that would be a much bigger change, so for now, have postponed that. Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com> (cherry picked from commit 87df5ab41b3f9b2bdd8682f4afd41dac78f7e96d) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Refactor global portallocator state into a global structPaul Bellamy2015-03-312-67/+82
| | | | | | | | | | | | | | Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com> (cherry picked from commit 12576798769081823a3f660b46290da808630616) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * windows: monitorTtySize correctly by pollingAhmet Alp Balkan2015-03-311-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes `monitorTtySize` work correctly on windows by polling into win32 API to get terminal size (because there's no SIGWINCH on windows) and send it to the engine over Remove API properly. Average getttysize syscall takes around 30-40 ms on an average windows machine as far as I can tell, therefore in a `for` loop, checking every 250ms if size has changed or not. I'm not sure if there's a better way to do it on windows, if so, somebody please send a link 'cause I could not find. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com> (cherry picked from commit ebbceea8a79766b7624dd7970a79054ecf582b6d) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Update libcontainer to c8512754166539461fd860451ffMichael Crosby2015-03-309-24/+215
| | | | | | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 17ecbcf8ff051575928a6e9fb13be0b034b3090d) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Use proper wait function for --pid=hostAlexander Morozov2015-03-301-1/+1
| | | | | | | | | | | | | | Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit 489ab77f4aea9bc3e7ada751cab5d827040b1e8b) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * Get child processes before main process dieAlexander Morozov2015-03-301-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Alexander Morozov <lk4d4@docker.com> Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Do not mask *exec.ExitErrorAlexander Morozov2015-03-301-7/+6
| | | | | | | | | | | | | | | | | | | | | | Fix #11764 Signed-off-by: Alexander Morozov <lk4d4@docker.com> (cherry picked from commit f468bbb7e8c89204bd5d8f346ecec4606b9f3b31) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
| * Add missing filters to bash completion for docker images and docker psHarald Albers2015-03-301-6/+34
| | | | | | | | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit cf438a542e76279715dc7d414a11845725044e90) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * Compress layers on push to a v2 registryDerek McGowan2015-03-302-14/+19
| | | | | | | | | | | | | | | | | | When buffering to file add support for compressing the tar contents. Since digest should be computed while writing buffer, include digest creation during buffer. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) (cherry picked from commit 851c64725d0b1b37e51fa0d0df744bbe82ad4c7b) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
| * Do not complete --cgroup-parent as _filedirHarald Albers2015-03-301-1/+1
| | | | | | | | | | | | | | | | | | This is a follow-up on PR 11708, as suggested by tianon. Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit a09cc935c3531e0132640f0fe258041f1b445fdc) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
| * aufs: apply dirperm1 by default if supportedDaniel, Dao Quang Minh2015-03-301-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically detect support for aufs `dirperm1` option and apply it. `dirperm1` tells aufs to check the permission bits of the directory on the topmost branch and ignore the permission bits on all lower branches. It can be used to fix aufs' permission bug (i.e., upper layer having broader mask than the lower layer). More information about the bug can be found at https://github.com/docker/docker/issues/783 `dirperm1` man page is at: http://aufs.sourceforge.net/aufs3/man.html Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (cherry picked from commit 281abd2c8aff542e3b0309eda15536177bcec713) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
View Lorry Controller Status