Can't stack more than 42 aufs layers #1171

Closed
Soulou opened this Issue Jul 9, 2013 · 66 comments

Projects

None yet
@Soulou
Contributor
Soulou commented Jul 9, 2013

Hello, thanks for this fabulous project

I'm encountering quite often an issue that I associate to broken images. In fact sometimes when I create a container, I'm getting the following error :

docker run -i -t #image# bash
2013/07/09 14:40:06 Error: Error starting container 042c2188714f: Unable to mount using aufs

However AUFS is working fine, using base image is just ok. The only way to use that image is to remove it and rebuild it again. What can be the causes of this image corruption ?

Thank you.

However, aufs is completely working

@vieux
Member
vieux commented Jul 9, 2013

Could you start the deamon in debug mode (with -D) and paste here the debug ?

Thanks.

@Soulou
Contributor
Soulou commented Jul 9, 2013

As soon as I'm able to reproduce it I'll post (next broken image) Thank you !

@Soulou
Contributor
Soulou commented Jul 9, 2013
[debug] api.go:883 Calling POST /containers/create
2013/07/09 16:11:25 POST /v1.3/containers/create
[debug] api.go:883 Calling POST /containers/{name:.*}/start
2013/07/09 16:11:25 POST /v1.3/containers/64e6343f4d63/start
2013/07/09 16:11:25 Kernel does not support AUFS, trying to load the AUFS module with modprobe...
2013/07/09 16:11:25 ...module loaded.

Nothing special in this output, aufs module is always loaded, the error is not there event if docker tries to modprobe again the driver. As I said before with another image it's working.

I'm using Ubuntu 12.04 LTS with PPA docker repository.

@creack
Contributor
creack commented Jul 9, 2013

/cc @jpetazzo

@jpetazzo
Contributor
jpetazzo commented Jul 9, 2013

I don't see any useful clue here, unfortunately!
Would there be a way to tar the broken image (and its dependencies) so we
can have a look?

@Soulou
Contributor
Soulou commented Jul 11, 2013

Ok next case I'll export the container if that's possible ! (Maybe the same error will occure)

@Soulou
Contributor
Soulou commented Jul 22, 2013

Broken Image :

docker run -i -t 298bd447a161 bash
2013/07/22 14:48:37 Error: Error starting container 2bdc2487652c: Unable to mount using aufs

Working Image :

docker run -i -t base bash
root@29dd2712d871:/# 
docker inspect 298bd447a161
[{
    "id": "298bd447a161615bd6cadb0a7e1a6646ae982d5ff46f676b873676498675bcb9",
    "parent": "a72f54bf6432c5961cbc777cc4cdbea54d11d6fae7483cd5e0d999d9f4aaf2fa",
    "created": "2013-07-22T14:38:37.039340267Z",
    "container": "8ff61bd27b30f5da3806c8f635ba6dc6aef489c247eceee276c5e566cff07985",
    "container_config": {
        "Hostname": "8ff61bd27b30",
        "User": "",
        "Memory": 0,
        "MemorySwap": 0,
        "CpuShares": 0,
        "AttachStdin": false,
        "AttachStdout": false,
        "AttachStderr": false,
        "PortSpecs": null,
        "Tty": false,
        "OpenStdin": false,
        "StdinOnce": false,
        "Env": null,
        "Cmd": [
            "/buildpacks/builder"
        ],
        "Dns": null,
        "Image": "app/testapp",
        "Volumes": null,
        "VolumesFrom": "",
        "Entrypoint": null
    },
    "docker_version": "0.5.0",
    "config": {
        "Hostname": "",
        "User": "",
        "Memory": 0,
        "MemorySwap": 0,
        "CpuShares": 0,
        "AttachStdin": false,
        "AttachStdout": false,
        "AttachStderr": false,
        "PortSpecs": null,
        "Tty": false,
        "OpenStdin": false,
        "StdinOnce": false,
        "Env": null,
        "Cmd": null,
        "Dns": null,
        "Image": "",
        "Volumes": null,
        "VolumesFrom": "",
        "Entrypoint": null
    },
    "architecture": "x86_64",
    "Size": 94881024

What is the best way to export the image ?

Thank you !

@Soulou
Contributor
Soulou commented Jul 22, 2013

I'm tarring and uploading /var/lib/docker/graph/[IMAGE_ID] will you be able to do something with that ?

@Soulou
Contributor
Soulou commented Jul 22, 2013

In fact this is the at least the 20th layers. (Each parent has a parent on more than 20 levels) Is their a limitation with AUFS on the number of layers we can mount ?

(Because the command which fails is directly moun -t aufs ... )

@vieux
Member
vieux commented Jul 22, 2013

@Soulou no, because the parents arent' there. could you docker push it ?

@shykes
Contributor
shykes commented Jul 22, 2013

@soulou yes there is a limit in the number of aufs layers, I think it's 42 (at least in the default build on ubuntu kernels).

@solomonstre
@getdocker

On Mon, Jul 22, 2013 at 8:32 AM, Victor Vieux notifications@github.com
wrote:

@Soulou no, because the parents arent' there. could you docker push it ?

Reply to this email directly or view it on GitHub:
#1171 (comment)

@apatil
Contributor
apatil commented Jul 23, 2013

I'm getting this also, 38 RUN commands plus one EXPOSE above the base image, on Ubuntu 13.0.4. Could it have something to do with the brs=1|0 option of http://manpages.ubuntu.com/manpages/karmic/man5/aufs.5.html?

              If the number of your branches is large or their  path  is  long
              and  you  meet the limitation of mount(8) ro /etc/mtab, you need
              to enable CONFIG_SYSFS and set aufs module parameter brs=1.   If
              your  linux  version  is  linux-2.6.24  and earlier, you need to
              enable CONFIG_AUFS_SYSAUFS too.

If it isn't feasible to increase aufs's maximum depth, implementing #332 would help a lot, especially if we could put some kind of FLATTEN command in dockerfiles.

One stopgap solution would be to let us group several shell commands into a single RUN command, so that we can decrease the number of layers we create without sacrificing too much readability:

RUN
    git clone git://github.com/apatil/repo
    cd repo
    ./configure
    make install
@jpetazzo
Contributor

When you get the "Unable to mount using aufs" error, do you get something
more in the kernel logs or the output of the docker daemon itself?
(That would be very helpful to pinpoint the root cause of the problem.)

On Mon, Jul 22, 2013 at 10:50 PM, Anand Patil notifications@github.comwrote:

I'm getting this also, 38 RUN commands plus one EXPOSE above the base
image, on Ubuntu 13.0.4. Could it have something to do with the brs=1|0option of
http://manpages.ubuntu.com/manpages/karmic/man5/aufs.5.html?

          If the number of your branches is large or their  path  is  long
          and  you  meet the limitation of mount(8) ro /etc/mtab, you need
          to enable CONFIG_SYSFS and set aufs module parameter brs=1.   If
          your  linux  version  is  linux-2.6.24  and earlier, you need to
          enable CONFIG_AUFS_SYSAUFS too.

If it isn't feasible to increase aufs's maximum depth, implementing #332https://github.com/dotcloud/docker/issues/332would help a lot, especially if we could put some kind of FLATTEN command
in dockerfiles.


Reply to this email directly or view it on GitHubhttps://github.com/dotcloud/docker/issues/1171#issuecomment-21394503
.

@apatil
Contributor
apatil commented Jul 24, 2013

From the Docker daemon:

[debug] api.go:64 [error 500] Unable to mount using aufs
2013/07/23 19:07:45 http: multiple response.WriteHeader calls

This is with revision a93a87f. Haven't found anything in the kernel logs.

@apatil
Contributor
apatil commented Jul 24, 2013

I can reproduce the problem by putting

FROM base
RUN "ls"
RUN "ls" # repeat 40-50 times

in a dockerfile, and doing docker build . inside its folder.

@keeb
Contributor
keeb commented Jul 24, 2013

@apatil there's a limit to how many AUFS layers can be created. I believe it's 42.

@crosbymichael
Member

Should we have an error message that is returned before doing docker build or when the maximum is reached?

@pinhao
pinhao commented Jul 24, 2013

I'm having the same problem on Ubuntu 12.04 LTS with PPA docker repository.
I think some FLATTEN command like is described in #332 would be a good solution.

@metalivedev
Contributor

Reproduced. Gist with sample Dockerfile and build output:
https://gist.github.com/metalivedev/6085112

@vieux
Member
vieux commented Jul 26, 2013

This is weird, once you reached the limit (use the Dockerfile fom @metalivedev)
You can't mount any more, doesn't look to be per image, but global.

ping @shykes @jpetazzo

@laurentpetit

Same problem here, also.

I understand why creating an image per step in the Dockerfile helps, noticeably while growing / debugging an image.
But maybe we should have the option to choose when this occurs, so that for the production of the final image, there are less intermediate ones produced.

Maybe either a flag passed to the command line to prevent the commit of intermediate images. Or directives inside the Dockerfile. (the former seems more interesting since you won't have to change the Dockerfile everytime you want to rewrite on it - and just before you want to create the final production image - )

@fsouza
Contributor
fsouza commented Jul 31, 2013

@laurentpetit I believe #332 is the answer for that.

@laurentpetit

@fsouza It's answer proposal which would solve the same problem, but not the same proposal :-). I like it also, but am not seeing it make progress :-/

@pdwinkel

I had the same problem

2013/08/17 20:59:59 Error: Error starting container af267a84f9c4: Unable to mount using aufs

Merging a few RUN commands, and the container starts normally.

@ykumar6
ykumar6 commented Aug 20, 2013

Hey Guys - We're experiencing the same problem with some images. We do not believe we have a layer issue (is there a way to check)?

In our kernel logs, we see this error
aufs opt_add:714:docker[15256]: lookup failed /var/lib/docker/graph/32737f8072d0 (-2)

@ykumar6
ykumar6 commented Aug 20, 2013

so docker history shows that we are hitting the limit :(
any good ideas on compressing the number of steps to a single layer?

@solomonstre

Yash, currently the only way to "squashing" the image is to create a
container from it, export that container into a raw tarball, and re-import
that as an image. Unfortunately that will cause all image metadata to be
lost, including its history but also ports, env, default command,
maintainer info etc. So it's really not great.

There are 2 things we can do to improve the situation:

  1. A short-term solution is to implement a "lossless export" function,
    which would allow exporting an image to a tarball with all its metadata
    preserved, so that it can be re-imported on the other side without loss.
    This would preserve everything except history, because an image config does
    not currently carry all of its history. We could try to plan this for 0.7
    which is scheduled for mid-September. That is, if our 0.7 release manager
    @vieux decides we have time to fit it in the release :)

  2. A 2nd step would be to add support for history as well. This is a little
    more work because we need to start storing an image's full history in each
    image, instead of spreading it out across all the aufs layers. This is
    planned for 0.8.

On Mon, Aug 19, 2013 at 9:00 PM, Yash Kumar notifications@github.comwrote:

so docker history shows that we are hitting the limit :(
any good ideas on compressing the number of steps to a single layer?

Reply to this email directly or view it on GitHubhttps://github.com/dotcloud/docker/issues/1171#issuecomment-22921077
.

@ykumar6
ykumar6 commented Aug 20, 2013

Thanks solomon. We're also playing around with aubrsync to copy down branches. Do you not recommend this approach?

We're expecting our commit history to get 100-150 layers long.

@solomonstre

This is related to issue #332.

On Mon, Aug 19, 2013 at 9:24 PM, Yash Kumar notifications@github.comwrote:

Thanks solomon. We're also playing around with aubrsync to copy down
branches. Do you not recommend this approach?

We're expecting our commit history to get 100-150 layers long.

Reply to this email directly or view it on GitHubhttps://github.com/dotcloud/docker/issues/1171#issuecomment-22921792
.

@shykes
Contributor
shykes commented Aug 21, 2013

Changed title from "Broken image : Unable to mount using aufs" for easier bookkeeping.

@shykes
Contributor
shykes commented Aug 21, 2013

Would aubrsync modify the contents of the underlying images? If so, it's not a viable option because images must always remain immutable.

I recommend watching issue #332 for a long-term solution.

The most practical short-term workaround, I think, would be to group RUN steps to keep their number low.

@thijsterlouw
Contributor

+1 also running into this

@johnjelinek

I'm dealing with this as well. I'll try merging some of my RUN commands.

@drewcsillag

One other way to attack this problem until it's fixed is to put sequential runs of RUN commands into a separate shell script (minus the leading RUN, of course). Then ADD the script and RUN it. You lose some measure of caching, but in the cases where you don't care about the intervening images, this should at least get you to the working state.

@srid
Contributor
srid commented Sep 1, 2013

what if we allowed RUN to accept multiline arguments, each representing a command? eg:

RUN apt-get -qy install git \
  git clone http://github.com/srid/myproject.git \
  cd myproject && git checkout v1.0

this way, all three commands would be run to create a single image (not three images), while avoiding the need to create an intermediate script.

@johnjelinek

You can already do that with && or ;
On Aug 31, 2013 8:18 PM, "Sridhar Ratnakumar" notifications@github.com
wrote:

what if we allowed RUN to accept multiline arguments, each representing a
command? eg:

RUN apt-get -qy install git
git clone http://github.com/srid/myproject.git
cd myproject && git checkout v1.0

this way, all three commands would be run to create a single image (not
three images), while avoiding the need to create an intermediate script.


Reply to this email directly or view it on GitHubhttps://github.com/dotcloud/docker/issues/1171#issuecomment-23616426
.

@mingfang
mingfang commented Sep 9, 2013

Is there a solution/workaround for this problem?

I'm trying to build an Openstack Dockerfile and am hitting this limitation.

@dsissitka
Contributor

Instead of using a bunch of RUNs ADD a script then use RUN to execute it.

@jpetazzo
Contributor

See also #332 , IMHO.

@jpetazzo
Contributor
jpetazzo commented Oct 1, 2013

If you are hit by this problem, you might want to check #1799 (multiline Dockerfile syntax) for the time being,.

@sebv sebv referenced this issue in Strider-CD/strider Oct 8, 2013
Closed

docker 42 layers limit #204

@joefiorini

I'm running into this issue now trying to run docker build .. I am using my own Dockerfile to setup an archlinux image. I checked the history of the base image and it only has 7 commits (each commit is a layer, right?) Here's the output of docker build .:

Uploading context 71680 bytes
Step 1 : FROM schmidh/arch-base
 ---> 80787b03bccd
Step 2 : MAINTAINER Joe Fiorini <joe@joefiorini.com>
 ---> Using cache
 ---> 52fa847e1945
Step 3 : RUN cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup && cp /etc/pacman.d/mirrorlist.pacnew /etc/pacman.d/mirrorlist && sed '/^#\S/ s|#||' -i /etc/pacman.d/mirrorlist
 ---> Using cache
 ---> 8950e2a990c2
Step 4 : RUN pacman -S --noconfirm reflector
 ---> Using cache
 ---> 7d4ed93ab743
Step 5 : RUN reflector --verbose -l 5 --sort rate --save /etc/pacman.d/mirrorlist && pacman -Syy
 ---> Using cache
 ---> 1a43cd075ac5
Step 6 : RUN pacman -S --noconfirm zsh vim tmux ack fortune-mod tcpdump netcat
 ---> Using cache
 ---> d9f9f406b563
Step 7 : RUN useradd -mG wheel -s /bin/zsh dev && usermod -aG tty dev
 ---> Using cache
 ---> ed9324b5ee20
Step 8 : RUN echo 'LANG="en_US.UTF-8"' > /etc/locale.conf
 ---> Using cache
 ---> e905ef7d9ca2
Step 9 : RUN pacman -S --noconfirm openssh mosh sqlite
 ---> Running in 40bcf7704358
Error build: Unable to mount using aufs
Unable to mount using aufs

A couple notes:

  • I have been testing similar dockerfiles for some time now so I have a number of other containers built from the same base
  • I tried adding --no-cache=true but that caused the aufs error after the first command
  • Between this dockerfile and the base image that only results in 16 layers, so I don't understand why it's hitting the 42 layer limit

Docker is my first exposure to Linux containers, so I could misunderstanding the "layers" concept. Is this my own mistake or a larger issue?

@jpetazzo
Contributor

As indicated in #2028, for the time being, the error message should at least be changed when we reach the layer limit.

@curoverse-bot curoverse-bot pushed a commit to curoverse/arvados that referenced this issue Nov 12, 2013
@qwrrty qwrrty Start the API container with supervisor, running postgres & apache2.
Reduce commands in Dockerfiles to stay under the 42-layer limit for AUFS
  (docker/docker#1171)
c1ca67f
@srikumarks

A couple of tips to compress ADD statements -

  1. ADD can copy over an entire directory tree. So watch out for cases where you're simply doing this file by file :)
  2. For those cases where some files need to be copied to various locations, ADD can unpack a tar archive at any location in the docker image. This means you can prepare a tar archive of the files in the appropriate places relative to the root of the fs and then unpack to / in a single command.
@Soulou
Contributor
Soulou commented Dec 6, 2013

I think this issue has been closed since 0.7

@Soulou Soulou closed this Dec 6, 2013
@srikumarks

@Soulou Well, I'm still encountering this kind of "lookup failed" errors with docker 0.7 on Ubuntu 13.04 (the digitalocean standard droplet config for docker) and this is the only thread I could find that was relevant to the problem.

@tianon
Member
tianon commented Dec 6, 2013

Yeah, until #2897 merges, this is still not fixed yet. :)

@tianon tianon reopened this Dec 6, 2013
@srikumarks

Just want to note here that it seems to me that the "lookup failed" error might be a distraction from some other problem.

I was experimenting with running node+redis in a docker instance and my server (digitalocean's standard docker setup) used to go down often, leaving mostly the "aufs lookup failed" type logs in /var/log/kern.log. I tried running the same normally, not using docker. Again, the server went down with the same kind of errors logged - i.e. I wasn't running a docker container at all, and these logs were showing up with all my processes being killed by the kernel.

I'm now trying to run the same in a non-docker instance to see whether the failures are due to some digitalocean oddities or what. That's been alright so far.

@creack creack closed this in #2897 Dec 14, 2013
@lox
lox commented Sep 17, 2014

We are running Docker 1.2.0 under Ubuntu 14.04 and are still seeing our images fail when theny have more than 42 layers. Is there anything we need to do to enable the increased image count?

@jessfraz
Contributor

@lox can you post the output of docker info

@lox
lox commented Sep 17, 2014
[debug] server.go:1036 Calling GET /info
[info] GET /v1.14/info
[5a41a262] +job info()
[5a41a262] +job subscribers_count()
[5a41a262] -job subscribers_count() = OK (0)
[5a41a262] -job info() = OK (0)
Containers: 0
Images: 45
Storage Driver: aufs
 Root Dir: /var/lib/docker/aufs
 Dirs: 45
Execution Driver: native-0.2
Kernel Version: 3.13.0-35-generic
Operating System: Ubuntu 14.04.1 LTS
Debug mode (server): true
Debug mode (client): false
Fds: 9
Goroutines: 12
EventsListeners: 0
Init Path: /usr/bin/docker
Username: 99designs
Registry: [https://index.docker.io/v1/]
WARNING: No swap limit support
@xzyfer
xzyfer commented Sep 17, 2014

#7863 looks to be related to @lox's issue

@lox
lox commented Sep 17, 2014

After some testing, this appears to specifically affect the kernel used in EC2, can't reproduce the issue elsewhere, but on Linux ip-172-31-32-231 3.13.0-35-generic #62-Ubuntu SMP Fri Aug 15 01:58:42 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux it happens consistently.

@lox
lox commented Sep 17, 2014

Possibly also related to? #4338

We'll do some testing on whether it's related to having docker's layers stored in /mnt.

@erikh
Contributor
erikh commented Sep 17, 2014

I seem to remember this being hard coded at 42 due to some AUFS limitations but after searching the code a tad now I’m not as sure.

On Sep 16, 2014, at 8:16 PM, Lachlan Donald notifications@github.com wrote:

Possibly also related to? #4338

We'll do some testing on whether it's related to having docker's layers stored in /mnt.


Reply to this email directly or view it on GitHub.

@jessfraz
Contributor

Its 127 now
On Sep 16, 2014 8:35 PM, "Erik Hollensbe" notifications@github.com wrote:

I seem to remember this being hard coded at 42 due to some AUFS
limitations but after searching the code a tad now I’m not as sure.

On Sep 16, 2014, at 8:16 PM, Lachlan Donald notifications@github.com
wrote:

Possibly also related to? #4338

We'll do some testing on whether it's related to having docker's layers
stored in /mnt.


Reply to this email directly or view it on GitHub.


Reply to this email directly or view it on GitHub
#1171 (comment).

@lox
lox commented Sep 17, 2014

Strangely, the problem occurs with docker mounted on /mnt/docker but works fine with /mnt/anything_else_here/docker. Truly bizarre, any insights into what might be causing that?

@tonistiigi tonistiigi added a commit to tonistiigi/docker that referenced this issue Nov 13, 2014
@tonistiigi tonistiigi Fix AUFS silent mount errors on many layers
Fixes #1171
Fixes #6465

Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous 
implementation checked if error was returned and then started to append layers 
one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the 
permission sections or in xino definition the call would not error and 
remaining layers would just be skipped(or some other unknown situation).

This also optimizes system calls as it tries to mount as much as possible with 
the first mount.


Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
6d97339
@vieux vieux added a commit to vieux/docker that referenced this issue Nov 20, 2014
@tonistiigi @vieux tonistiigi + vieux Fix AUFS silent mount errors on many layers
Fixes #1171
Fixes #6465

Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous
implementation checked if error was returned and then started to append layers
one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the
permission sections or in xino definition the call would not error and
remaining layers would just be skipped(or some other unknown situation).

This also optimizes system calls as it tries to mount as much as possible with
the first mount.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
90cb15f
@yoheiueda yoheiueda added a commit to yoheiueda/docker that referenced this issue Nov 21, 2014
@tonistiigi @yoheiueda tonistiigi + yoheiueda Fix AUFS silent mount errors on many layers
Fixes #1171
Fixes #6465

Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous
implementation checked if error was returned and then started to append layers
one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the
permission sections or in xino definition the call would not error and
remaining layers would just be skipped(or some other unknown situation).

This also optimizes system calls as it tries to mount as much as possible with
the first mount.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
ba24617
@jessfraz jessfraz added a commit to jessfraz/docker that referenced this issue Nov 26, 2014
@jessfraz jessfraz Merged commit of the following:
commit 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Merge: 9160e01 90928eb
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Tue Nov 25 18:03:51 2014 -0800

    Merge pull request #9208 from duglin/Issue8703

    Add support for docker exec to return cmd exitStatus

commit 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Merge: 6a0177e f0f0e31
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Tue Nov 25 17:52:27 2014 -0800

    Merge pull request #8893 from vieux/filter_events

    Events filtering (daemon side)

commit 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Author: Doug Davis <dug@us.ibm.com>
Date:   Mon Nov 17 15:50:09 2014 -0800

    Add support for docker exec to return cmd exitStatus

    Note - only support the non-detached mode of exec right now.
    Another PR will add -d support.

    Closes #8703

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit 6a0177ed2e760bc3298eb6dbc28d325ab2e353bc
Merge: 79064a2 68bc8de
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Tue Nov 25 17:17:35 2014 -0800

    Merge pull request #8767 from erikh/update_parents_hosts_part2

    Links test cleanup

commit 79064a28203496c8f63510e73c32a7135f456a27
Merge: 1eb5e5d dfcf05a
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Tue Nov 25 20:04:26 2014 -0500

    Merge pull request #9279 from yoheiueda/termios-via-cgo

    Use termios via CGO

commit 68bc8de111e4faa2a16583cd45b5c0fd253a3bba
Author: Erik Hollensbe <github@hollensbe.org>
Date:   Fri Oct 24 21:39:12 2014 +0000

    Test for updating hosts files via links.

    Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

commit 20575d20bad60172b9d1f40c9fe357b7c069f466
Author: Erik Hollensbe <github@hollensbe.org>
Date:   Fri Oct 24 18:12:54 2014 +0000

    Break some routines out of the mutable files test for future use

    Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

commit 1eb5e5d25faac6ef175285fb8606484928309802
Merge: 1dadc51 bd4fe9b
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Tue Nov 25 16:15:48 2014 -0800

    Merge pull request #9030 from cpuguy83/cleanup_host_parser

    Cleanup ParseHost

commit f0f0e316aab2c8cc6e2f0124c7bde7661a15461c
Author: Victor Vieux <vieux@docker.com>
Date:   Tue Nov 25 17:07:04 2014 +0000

    fix tests

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit bd4fe9b9867c7633e520130b99e02798f49e6b44
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Fri Nov 7 13:44:35 2014 -0500

    Cleanup ParseHost

    Current implementation is comingling things that ought not be together.
    There are _some_ similarities between parsing for the different proto
    types, but they are more different than alike, making the code extremely
    difficult to reason about.

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit 1dadc51adc9f8d20c4e1d20c120dfe253b61b99c
Merge: 93be7c0 3db5ea1
Author: unclejack <unclejack@users.noreply.github.com>
Date:   Wed Nov 26 01:45:51 2014 +0200

    Merge pull request #9342 from unclejack/add_tarsum_maintainers

    pkg/tarsum: add maintainers & add missing s

commit 3db5ea1617549bbef7f645d4ecbf482ad1f31c71
Author: unclejack <unclejacksons@gmail.com>
Date:   Wed Nov 26 00:41:42 2014 +0200

    pkg/tarsum: add maintainers & add missing s

    Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

commit 93be7c0e52894dcb7a71196a699f41bb24395d8e
Merge: 7ebcdad 6158641
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Tue Nov 25 14:21:00 2014 -0800

    Merge pull request #9262 from rhatdan/debug

    Allow developers to build docker with debuginfo included

commit 61586414ca227f7c61395ccf9605f5ceece54399
Merge: bce9ed0 7ebcdad
Author: Dan Walsh <dwalsh@redhat.com>
Date:   Tue Nov 25 14:09:19 2014 -0500

    Merge branch 'master' of github.com:docker/docker into debug

    Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

commit 7ebcdad03043a5cb423aaecbc7932fea76a2f7db
Merge: 2712743 eac9f2e
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Tue Nov 25 09:27:31 2014 -0800

    Merge pull request #9238 from albers/bash-completion

    Add missing options to bash completion for the run and create commands

commit dfcf05a5d070823ade84ffba0e9784cdfe6d54b0
Author: Yohei Ueda <yohei@jp.ibm.com>
Date:   Tue Nov 25 20:49:01 2014 +0900

    Use termios via CGO only on Linux

    Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>

commit eac9f2e5c4fa47b0ef1e064ac2bc62be6f3a3c99
Author: Harald Albers <github@albersweb.de>
Date:   Wed Nov 19 14:29:56 2014 +0100

    Minor bash completion cleanup

    The -n and --networking options were removed because they are
    unsupported.
    Bash completion should not reveal the existence of otherwise
    undocumented unsupported options.

    Signed-off-by: Harald Albers <github@albersweb.de>

commit 2e863e8a3849f6ea34dd281aac6f8a6c700bf029
Author: Harald Albers <github@albersweb.de>
Date:   Mon Nov 17 17:13:58 2014 +0100

    Add missing options to bash completion for the run and create commands

    Signed-off-by: Harald Albers <github@albersweb.de>

commit 27127437a6249bbf6f70707ff681992eb00ac47b
Merge: 498985a 33e0de1
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 24 18:11:59 2014 -0800

    Merge pull request #9224 from tianon/custom-debootstrap

    Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap

commit 498985a0398eccafaf2e2f2668a469386e3780f1
Merge: e6ec703 4dd3368
Author: Tibor Vass <teabee89@gmail.com>
Date:   Mon Nov 24 20:06:34 2014 -0500

    Merge pull request #9325 from unclejack/add_1.3.2_relnotes

    docs: Add 1.3.2 release notes

commit 4dd3368b51b2b00936f91fcc951d81d0c0d918ae
Author: Tibor Vass <teabee89@gmail.com>
Date:   Mon Nov 24 11:33:38 2014 -0500

    docs: Add 1.3.2 release notes

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

commit e6ec703df31f04c3ea3a6aeb19881494a6ae58ae
Merge: 2ad98b0 b21e1d4
Author: Tibor Vass <teabee89@gmail.com>
Date:   Mon Nov 24 19:26:36 2014 -0500

    Merge pull request #9323 from unclejack/merge_release_v1.3.2

    Merge release v1.3.2 to master

commit 2ad98b0cfa355901d345ab361160439b1a283971
Merge: fc66a22 5794b53
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 24 16:07:42 2014 -0800

    Merge pull request #9324 from crosbymichael/git-urls

    Move IsGIT and IsURL to urlutil package

commit b21e1d4a00f2687ef24aa47039ac2f0281294365
Author: Tibor Vass <teabee89@gmail.com>
Date:   Fri Nov 14 14:47:37 2014 -0800

    Add v1.3.2 changelog & bump version to 1.3.2-dev

    Signed-off-by: Tibor Vass <teabee89@gmail.com>
    Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

commit 2ec2237909ba51d3fe10a2ee6cfb81f315408f68
Author: unclejack <unclejacksons@gmail.com>
Date:   Tue Nov 25 01:28:20 2014 +0200

    graph/load: add build tags to fix make cross

    Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

commit 5794b5373ef26846b3cc5e48e651208771d12b19
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Nov 24 18:47:42 2014 -0500

    Update code for use of urlutil pkg

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit fc66a22df6c08f1434eb77991410a1359c5afa49
Merge: 4996d46 acdf766
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 24 15:45:54 2014 -0800

    Merge pull request #9173 from vbatts/vbatts-dm_clarify_TaskCreate

    pkg/devicemapper: clarify TaskCreate and createTask

commit 4996d46a365f9999c9db58dd7bf63d314ff8e87f
Merge: df7c22d 88afbc4
Author: Victor Vieux <victorvieux@gmail.com>
Date:   Mon Nov 24 15:26:25 2014 -0800

    Merge pull request #9289 from duglin/mflagSetTest

    Add missing unit testcase for new IsSet() func in mflag

commit feca1b1780a0942aafc1796d1fd52026a673bf92
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Nov 24 18:10:37 2014 -0500

    Move git and url checks into pkg

    This moves the IsGIT and IsURL functions out of the generic `utils`
    package and into their own `urlutil` pkg.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit f6d9780229bfa52c86762d49a7a7e644dcd8f6df
Author: Tibor Vass <teabee89@gmail.com>
Date:   Wed Nov 19 11:27:34 2014 -0500

    archive: do not call FollowSymlinkInScope in createTarFile

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

commit 330171e1d9ec537d7f691fd63c697a0540589053
Author: unclejack <unclejacksons@gmail.com>
Date:   Tue Nov 18 23:33:13 2014 +0200

    pkg/chrootarchive: provide TMPDIR for ApplyLayer

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 31d1d733037b22591e2dd2edfe6c4d2d4b8086cc
Author: Tibor Vass <teabee89@gmail.com>
Date:   Fri Oct 31 13:18:39 2014 -0400

    archive: prevent breakout in ApplyLayer

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

commit 1852cc38415c3d63d18c2938af9c112fbc4dfc10
Author: Tibor Vass <teabee89@gmail.com>
Date:   Mon Oct 20 15:36:28 2014 -0400

    archive: prevent breakout in Untar

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

commit 221617dbcd9431f14a3779d8bac9aba52f78ea21
Author: Tibor Vass <teabee89@gmail.com>
Date:   Mon Oct 20 15:35:48 2014 -0400

    archive: add breakout tests

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

    Conflicts:
    	pkg/archive/archive.go
    		fixed conflict which git couldn't fix with the added BreakoutError

    Conflicts:
    	pkg/archive/archive_test.go
    		fixed conflict in imports

commit 209deff9633b82198925846ebcb0a02191553005
Author: unclejack <unclejacksons@gmail.com>
Date:   Tue Nov 11 13:02:14 2014 +0200

    don't call reexec.Init from chrootarchive

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

    Conflicts:
    	daemon/graphdriver/aufs/aufs_test.go
    		fixed conflict caused by imports

commit 9c01bc249dc628280f3fc019d5f0e0ace71be248
Author: Tibor Vass <teabee89@gmail.com>
Date:   Sat Nov 8 10:38:42 2014 -0500

    pkg/chrootarchive: pass TarOptions via CLI arg

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

    Conflicts:
    	graph/load.go
    		fixed conflict in imports

commit 1cb17f03d0b217acf2d2c289b4946d367f9d3e80
Author: unclejack <unclejacksons@gmail.com>
Date:   Wed Oct 29 21:06:51 2014 +0200

    add pkg/chrootarchive and use it on the daemon

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

    Conflicts:
    	builder/internals.go
    	daemon/graphdriver/aufs/aufs.go
    	daemon/volumes.go
    		fixed conflicts in imports

commit fa1484d12c5b66f7db03a9c93002ba3df56cdb4e
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Nov 3 23:00:49 2014 +0000

    Add AppArmorProfile to container inspect json

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit 294843ef23fcff3c080d9fbd12df17ae7006a9f8
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Nov 3 22:57:18 2014 +0000

    Move security opts to HostConfig

    These settings need to be in the HostConfig so that they are not
    committed to an image and cannot introduce a security issue.

    We can safely move this field from the Config to the HostConfig
    without any regressions because these settings are consumed at container
    created and used to populate fields on the Container struct.  Because of
    this, existing settings will be honored for containers already created
    on a daemon with custom security settings and prevent values being
    consumed via an Image.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

    Conflicts:
    	daemon/create.go
    		changing config to hostConfig was required to fix the
    		 build

commit df7c22dd2307cb530b300a84ae9ddcc951dc3e47
Merge: 39284be c7e4cc4
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 24 14:51:52 2014 -0800

    Merge pull request #9162 from aidanhs/patch-1

    Allow git@ urls for more than just github

commit faab87cc36fb6f02ddd53e1be09f10623a40773a
Author: unclejack <unclejacksons@gmail.com>
Date:   Tue Oct 28 23:18:45 2014 +0200

    pkg/symlink: avoid following out of scope

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 39284be960d3d528ecf3faaa7900f4718e959c06
Merge: 748fe7a d4ba00b
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 24 13:35:45 2014 -0800

    Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api

    Cleanup exec API docs and available params

commit c7e4cc4a531b5337d64bda22df8553e646a96fe7
Author: Aidan Hobson Sayers <aidanhs@cantab.net>
Date:   Fri Nov 14 01:52:55 2014 +0000

    Allow git@ prefixes for any hosted git service

    Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>

commit 748fe7a0fa8df73d89df729ce307c24ac881ae1e
Merge: b475744 34fe2a3
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Mon Nov 24 13:36:58 2014 -0700

    Merge pull request #9291 from vincentbernat/fix/zsh-completion-update-2

    zsh: correctly parse available subcommands (completion)

commit b4757445ae5dd4de63d793d2c54232d5254b7a9c
Merge: 5e19ecf 5deedef
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 24 12:27:56 2014 -0800

    Merge pull request #9301 from krivenok/master

    Fixed typo in documentation.

commit 5e19ecf25c942ae809ad5b5cf0bb010845395e58
Merge: fefaf6a 054e57a
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 24 12:10:45 2014 -0800

    Merge pull request #9281 from unclejack/build_pull_flag

    build: add pull flag to force image pulling

commit fefaf6a73db52b6d20774f049d7456e2ba6ff5ca
Merge: 66266a0 d96832c
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 24 12:02:12 2014 -0800

    Merge pull request #9290 from vaijab/registry-address

    registry: fix ServerAddress setting

commit 66266a0ed94de5099d9ca75ecd6b3bc05c559e78
Merge: cbc401c 7fbbd51
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 24 11:58:13 2014 -0800

    Merge pull request #9312 from daehyeok/deprecated_cmd

    remove deprecated cmd function in integration-cli

commit cbc401ccfac7e044f3f4043990c7a7a93ed41874
Merge: c59b308 91a8b91
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 24 11:55:21 2014 -0800

    Merge pull request #9303 from rmetzler/patch-1

    Empty Line should fix Markdown unordered list

commit d96832cbd2c62103944518866e1fc1219ce048d5
Author: Vaidas Jablonskis <jablonskis@gmail.com>
Date:   Sat Nov 22 23:21:47 2014 +0000

    registry: fix ServerAddress setting

    This ensures that ServerAddress is set, while previously it was getting
    set after configFile.Configs.

    Signed-off-by: Vaidas Jablonskis <jablonskis@gmail.com>

commit 5deedef42c7d85835729ecf4fe61ec91612089af
Author: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
Date:   Mon Nov 24 21:22:54 2014 +0300

    Made wording a bit more generic.

commit 7fbbd515b1018721e91199960d1933383a8262a1
Author: Daehyeok Mun <daehyeok@gmail.com>
Date:   Tue Nov 25 00:32:38 2014 +0900

    remove deprecated cmd function in integration-cli
    Remove deprecated cmd function in integration-cli
    and change cmd to dockerCmd in all test files

    Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>

commit 91a8b916b09615119e80a1193f1a2f6c01143106
Author: Richard Metzler <richard@paadee.com>
Date:   Sun Nov 23 23:57:43 2014 +0100

    Empty Line should fix Markdown unordered list

    Without the line break the list would render as one single paragraph.

commit 745e3f77a127c5be2e7d563e402e3e4a7d5d7729
Author: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
Date:   Sun Nov 23 22:59:35 2014 +0300

    Fixed typo in documentation.

commit 34fe2a372576907cb7ec26cf22ac4e93b8974f6e
Author: Vincent Bernat <vincent@bernat.im>
Date:   Sun Nov 23 00:45:14 2014 +0100

    zsh: correctly parse available subcommands

    A lot of flags have been added on the output of `docker help`. Use a
    more robust method to extract the list of available subcommands by
    spotting the `Command:` line and the next blank line.

    Signed-off-by: Vincent Bernat <vincent@bernat.im>

commit 88afbc4d94c4a803e936d602c620b8ab08e24acd
Author: Doug Davis <dug@us.ibm.com>
Date:   Sat Nov 22 05:25:57 2014 -0800

    Add missing unit testcase for new IsSet() func in mflag

    Forgot to add this when I did PR #9259

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Merge: d7626e9 cb57c38
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Nov 21 19:58:01 2014 -0800

    Merge pull request #9223 from vbatts/vbatts-overlay_notfound

    overlayfs: more helpful output when not supported

commit d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Author: Brian Goff <cpuguy83@gmail.com>
Date:   Thu Nov 20 13:01:59 2014 -0500

    Cleanup exec API docs and available params

    Adds pertitent information about what is expected in the json payload
    and comments out unsupported (exec) features in runConfig.

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>

commit d7626e97b61f5f8f5d585ec82d6154395a3f9404
Merge: fb15401 4deac03
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Fri Nov 21 17:57:56 2014 -0800

    Merge pull request #9188 from somaopensource/8777-fix

    Fix for #8777 (continuing PR #9061)

commit acdf766069f8e8c65fd3de3ce4f8efc15f421abd
Author: Vincent Batts <vbatts@redhat.com>
Date:   Fri Nov 14 09:33:13 2014 -0500

    pkg/devicemapper: clarify TaskCreate and createTask

    * Rename and expose createTask() to TaskCreateNamed()
    * add comments

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit fb1540199e2a7fb8aaf7918a9a35d1f21adeaad5
Merge: 104d27a edc6df2
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 21 17:28:37 2014 -0800

    Merge pull request #9183 from vbatts/dm_udevwait

    devmapper: Call UdevWait() even in failure path

commit 104d27a07b78f1a029e60b69a4488132982ae12e
Merge: e820365 f8509e7
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Fri Nov 21 20:23:43 2014 -0500

    Merge pull request #9267 from crosbymichael/devmapper-mknod

    Mknod more loopbacks for devmapper

commit e820365b677cff6a5f3b073da1a3ebb21e5f8247
Merge: 496db27 5cd9b75
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 21 17:12:55 2014 -0800

    Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests

    pkg/tarsum: adding more tests

commit 496db275d540d754774d4e2867bdcb666464af20
Merge: 07b7bdb 20218f3
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 21 16:40:27 2014 -0800

    Merge pull request #9185 from djmaze/patch-1

    Fix link to MAINTAINERS.md in CONTRIBUTING.md

commit f8509e7940d73ecc0071faf15a865acb1f8dad52
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Thu Nov 13 19:33:41 2014 -0800

    Mknod more loopbacks for devmapper

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit 20218f39718673d3ae5822aeecfd08ea0c6e8126
Author: Martin Honermeyer <maze@strahlungsfrei.de>
Date:   Sat Nov 15 21:49:47 2014 +0100

    Fix link to MAINTAINERS.md in CONTRIBUTING.md

    Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>

commit 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Merge: c78bf8d e527be1
Author: unclejack <unclejack@users.noreply.github.com>
Date:   Sat Nov 22 01:56:31 2014 +0200

    Merge pull request #9270 from jfrazelle/8919-tag-output

    Output image with tag name when image is not found

commit c78bf8d86a912adafa0c2514e9224431a887b197
Merge: 17ba356 62a7d75
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 21 15:14:27 2014 -0800

    Merge pull request #9265 from vieux/daemon_labels

    add daemon labels (displayed in docker info)

commit 17ba356e9a291e5d128d8b6f6c4a8f2b9f1f1778
Merge: 44159f3 82f33d8
Author: Tibor Vass <teabee89@gmail.com>
Date:   Fri Nov 21 18:02:11 2014 -0500

    Merge pull request #9158 from tianon/minor-makefile-preamble-reorg

    Add some minor reorganization to the Makefile preamble

commit 82f33d86a7c4d41d3c880757d35c81c847a9ab69
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Thu Nov 13 16:04:13 2014 -0700

    Add some minor reorganization to the Makefile preamble

    The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process).

    Signed-off-by: Andrew Page <admwiggin@gmail.com>

commit 44159f38d2b6d92e21b7c4b43bfd9ba7dce3719e
Merge: a43ee07 57b6993
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Fri Nov 21 14:07:45 2014 -0800

    Merge pull request #9209 from SvenDowideit/shared-disk-space-images

    If an image has more than one repo name or tag, it'll be listed more tha...

commit a43ee077dca75d0e8f198275db17eac341b0ca8c
Merge: a527776 a01f1e7
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Fri Nov 21 16:37:28 2014 -0500

    Merge pull request #9149 from swagiaal/fix-configureBridge-comment

    Remove reference to 'ifaceName' from configureBridge comment.

commit a5277764aed9e5493387a6f4caf2bb93a0a6afa3
Merge: 0f2de51 b37fdc5
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Fri Nov 21 15:44:27 2014 -0500

    Merge pull request #9009 from a-ba/fix-export-repo

    fix missing layers when exporting a full repository

commit 62a7d75512d939a86cbc58986278548df3302902
Author: Victor Vieux <vieux@docker.com>
Date:   Fri Nov 21 19:15:22 2014 +0000

    key=values -> key=value

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 054e57a622e6a065c343806e7334920d17a03c5b
Author: unclejack <unclejacksons@gmail.com>
Date:   Fri Nov 21 19:51:32 2014 +0200

    build: add pull flag to force image pulling

    Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

commit 0f2de5158fe66b4906de176f90e3e6d813336450
Merge: ce8ebaf 4180579
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Fri Nov 21 08:48:04 2014 -0800

    Merge pull request #9261 from unclejack/fix_test_tmp_cleanup

    fix cleanup of /tmp in tests

commit ce8ebaf0e013fd4a7f6e04b36d0a2c57a19aeef9
Merge: e3f3259 ce86d5a
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Fri Nov 21 08:37:19 2014 -0800

    Merge pull request #9225 from icecrime/win_make_binary

    Adapt project/make.sh for Windows builds

commit 4180579313e84ea7e3d85214521a815e95459a90
Author: unclejack <unclejacksons@gmail.com>
Date:   Thu Nov 20 19:39:08 2014 +0200

    graphdriver/aufs: fix tmp cleanup in tests

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 244af451e9bdff5c87bca84e4c15193fc9eebc64
Author: Yohei Ueda <yohei@jp.ibm.com>
Date:   Fri Nov 21 22:12:03 2014 +0900

    Use termios via CGO

    Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>

commit e3f3259e006e955d2a280d9f37451b5813657b4a
Merge: 532e502 f6c7194
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Thu Nov 20 19:03:38 2014 -0800

    Merge pull request #9271 from jfrazelle/iptables-errors

    Typed errors for iptables chain raw command output. YAYYYYYY.

commit f6c7194539720473aae814d3d1445eab2a78d568
Author: Jessica Frazelle <jess@docker.com>
Date:   Thu Nov 20 16:20:29 2014 -0800

    Apply same typed iptables errors to network driver.

    Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

commit 6cc75574b3b01fa4dfeeef585e52dbcf8da28586
Author: Jessica Frazelle <jess@docker.com>
Date:   Thu Nov 20 16:07:55 2014 -0800

    Typed errors for iptables chain raw command output. YAYYYYYY.

    Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

commit 532e502e9c37d1caab59f9e8d188f6700b197ebb
Merge: 5d67a3f ae9bd58
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 20 17:41:31 2014 -0800

    Merge pull request #9259 from duglin/Issue9221

    Make --tlsverify enable tls regardless of value specified

commit 5d67a3faea400273e4307db7990a51fc2d2ca0dc
Merge: 5cde77d e257863
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 20 17:15:15 2014 -0800

    Merge pull request #9248 from vbatts/vbatts-fix_gh9241

    pkg/tarsum: actually init the TarSum struct

commit 5cde77d003892fa20f82f9bf586c7623494d6cbf
Merge: 29f4ea2 56c3753
Author: unclejack <unclejack@users.noreply.github.com>
Date:   Fri Nov 21 02:50:04 2014 +0200

    Merge pull request #9269 from crosbymichael/update-libcontainer-nov20

    Update libcontainer to 84c1636580a356db88b079d118b94abe6a1a0acd

commit ae9bd580af55992974fcb94f73f72cc3b2257fec
Author: Doug Davis <dug@us.ibm.com>
Date:   Thu Nov 20 07:29:04 2014 -0800

    Make --tlsverify enable tls regardless of value specified

    I also needed to add a mflag.IsSet() function that allows you to check
    to see if a certain flag was actually specified on the cmd line.

    Per #9221 - also tweaked the docs to fix a typo.

    Closes #9221

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit 29f4ea2cd5ee0988abb24264e4dbf01fa52d2d54
Merge: c1a40d9 8d3b13b
Author: Fred Lifton <fred.lifton@docker.com>
Date:   Thu Nov 20 16:02:38 2014 -0800

    Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg

    Add an example that shows starting apache in the foreground

commit c1a40d927999a7e019f1952c2b140ef6e4a76171
Merge: 4acdb7d a0fb8ec
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 20 15:19:31 2014 -0800

    Merge pull request #9228 from SvenDowideit/update-tlsverify-doc

    tlsverify flag has no dash

commit e527be1f14eda5a3d9077517a0398d85c4d7fac6
Author: Jessica Frazelle <jess@docker.com>
Date:   Thu Nov 20 15:09:09 2014 -0800

    Fix tag output where image is not found.

    Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

commit 7a7890950d59abf7bc4f826c605289e1d7586390
Author: Lei Jitang <leijitang@huawei.com>
Date:   Tue Nov 4 11:46:53 2014 +0800

    Fix create container output messages.

    Signed-off-by: Lei Jitang <leijitang@huawei.com>
    Signed-off-by: Jessica Frazelle <jess@docker.com>

commit 56c37536315d4c63c35b766e3335034e488e2189
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Thu Nov 20 14:22:22 2014 -0800

    Revert "Support hairpin NAT"

    This reverts commit 95a400e6e1a3b5da68431e64f9902a3fac218360.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit 8d3b13bd7a14aa41eb3d3f3aab1b974af1db4a50
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Tue Nov 18 11:42:54 2014 -0800

    Add an example that shows starting apache in the foreground

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit 4acdb7ddc7f10cd707d02ca88317056e988b2abb
Merge: 9a917e7 72c55e8
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 20 14:20:31 2014 -0800

    Merge pull request #9260 from LK4D4/increase_proxy_timeout

    Increase timeout for userland proxy starting

commit f42176434aa874afb7d633064f2babcf9d5124ab
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Thu Nov 20 14:19:24 2014 -0800

    Update libcontainer to 84c1636580a356db88b079d118b

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit 9a917e732c8f84f365b36a5a92bdb1f546a7e4d1
Merge: 58b6f31 2bceaae
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 20 13:31:51 2014 -0800

    Merge pull request #9174 from dqminh/docker-exec-env

    Set correct env variables for `docker exec` commands

commit 58b6f31a7a3157b5ece418da0a976a28dae9841d
Merge: 998b591 1314e15
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 20 13:12:24 2014 -0800

    Merge pull request #8251 from duglin/Issue2333

    Add support for ENV of the form: ENV name=value ...

commit 284cbda9ceb368d4bb67c0c75739984622570d92
Author: Victor Vieux <vieux@docker.com>
Date:   Thu Nov 20 19:54:03 2014 +0000

    docs nits

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 7ff3b81054b028a4399c86340489fe3937049abe
Author: Victor Vieux <vieux@docker.com>
Date:   Thu Nov 20 19:46:48 2014 +0000

    events filtering

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 2fe36baa0a39840e64f1dc585af41b5ee0ed6df5
Author: Victor Vieux <vieux@docker.com>
Date:   Thu Nov 20 18:36:05 2014 +0000

    add daemon labels

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 998b591a71094b3f0112dac9b0c35a93745ac28f
Merge: 739d917 8ef36dc
Author: Tibor Vass <teabee89@gmail.com>
Date:   Thu Nov 20 13:11:16 2014 -0500

    Merge pull request #9201 from vieux/add_hostname_docker_info

    Add hostname and ID docker info

commit 2bceaae42399ce33e8c724d1ac435eca6759637b
Author: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Date:   Fri Nov 14 12:37:04 2014 -0500

    test case for preserving env in exec session

    Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

commit bce9ed0e4c56b85c8a4a5ba2b1af45035deec9dd
Author: Dan Walsh <dwalsh@redhat.com>
Date:   Thu Nov 20 12:56:54 2014 -0500

    Allow developers to build docker with debuginfo included

    If you execute

    DEBUG=-g hack/make.sh dynbinary

    Docker will be build with the debug info making it easier to use
    cgdb or lightide to debug.

    Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

commit 1314e1586f8cd6201c16161eb960a743c727946b
Author: Doug Davis <dug@us.ibm.com>
Date:   Thu Sep 25 19:28:24 2014 -0700

    Add support for ENV of the form: ENV name=value ...
    still supports the old form: ENV name value

    Also, fixed an issue with the parser where it would ignore lines
    at the end of the Dockerfile that ended with \

    Closes #2333

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit 8ef36dcfe75752a5705813e2d9fa9359a8162b18
Author: Victor Vieux <vieux@docker.com>
Date:   Mon Nov 17 22:06:03 2014 +0000

    update docs

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Author: Victor Vieux <vieux@docker.com>
Date:   Mon Nov 17 21:54:11 2014 +0000

    Hostname -> Name

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 6e92dfdfd843aec909572a405337efb25beb6f58
Author: Victor Vieux <vieux@docker.com>
Date:   Mon Nov 17 19:39:55 2014 +0000

    Update libtrust version

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit db7fded17fd984fc3c854d1e34bd8d656c3b3692
Author: unclejack <unclejacksons@gmail.com>
Date:   Thu Nov 20 19:38:41 2014 +0200

    integ-cli: fix cleanup in build tests

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 98307c8faefca5c4347288af18aee4dacbf8802c
Author: unclejack <unclejacksons@gmail.com>
Date:   Thu Nov 20 19:37:46 2014 +0200

    integ-cli: fix cleanup in test which mounts tmpfs

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 4508bd94b0efd07a0ef48cd090786615e6b8cbb7
Author: unclejack <unclejacksons@gmail.com>
Date:   Thu Nov 20 19:36:54 2014 +0200

    pkg/symlink: fix cleanup for tests

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 32ba6ab83c7e47d627a2b971e7f6ca9b56e1be85
Author: unclejack <unclejacksons@gmail.com>
Date:   Thu Nov 20 19:34:35 2014 +0200

    pkg/archive: fix TempArchive cleanup w/ one read

    This fixes the removal of TempArchives which can read with only one
    read. Such archives weren't getting removed because EOF wasn't being
    triggered.

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 769b79866aa645d4deeeb0a44120cde7b046f0d1
Author: unclejack <unclejacksons@gmail.com>
Date:   Thu Nov 20 19:33:15 2014 +0200

    pkg/system: fix cleanup in tests

    Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

commit 72c55e82156843c73ab1405b565e63d947b66c10
Author: Alexandr Morozov <lk4d4@docker.com>
Date:   Thu Nov 20 09:02:21 2014 -0800

    Increase timeout for userland proxy starting

    Fixes #8883

    Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

commit 4deac03c65edf34affd66abd3ef8fb88287d2f5a
Author: Oh Jinkyun <tintypemolly@gmail.com>
Date:   Mon Nov 3 20:11:29 2014 +0900

    Fix for #8777

    Now filter name is trimmed and lowercased before evaluation for case
    insensitive and whitespace trimemd check.

    Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>

commit 739d917d7094db822ecfe927e1e934c3c8ec4047
Merge: d4ca9e5 71209f7
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Wed Nov 19 17:57:45 2014 -0800

    Merge pull request #9226 from crosbymichael/container-net-test

    Add test for --net container:<id>

commit d4ca9e5cce2ff7e08750123609df1864e0befdcf
Merge: adc344d e6fd57b
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Wed Nov 19 17:52:35 2014 -0800

    Merge pull request #9211 from mtesselH/login

    Fixed a bug - no panic anymore when logining in without TTY

commit 71209f75791fdc1a2124682f50cd00a413ddb143
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Tue Nov 18 15:10:07 2014 -0800

    Add test for --net container:<id>

    This adds an integration test for checking that the network namespace
    fds are the same when a container joins another container's network
    namespace.

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit adc344dfdee7dd006f8855d7af83b00683b5660e
Merge: 3e5cb0c f4acfee
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Wed Nov 19 17:41:46 2014 -0800

    Merge pull request #9180 from chenchun/master

    Clean config path of bind mount volume

commit cb57c388480d03770378e6e1842c2c1c6a46d8fd
Author: Vincent Batts <vbatts@redhat.com>
Date:   Tue Nov 18 23:22:32 2014 -0500

    overlayfs: add --storage-driver doc

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit 3e5cb0c84f390c2c939061ae34754e3924f82790
Merge: eb3bbde b4346c4
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Wed Nov 19 15:26:20 2014 -0800

    Merge pull request #9191 from duglin/Issue8775

    Be clearer in docs about COPY/ADD dirs

commit eb3bbde6d18bb35774cd3ab2c6eba0016f679d2b
Merge: c7e6ad8 6705477
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Wed Nov 19 15:25:42 2014 -0800

    Merge pull request #9251 from tonistiigi/use-format-logging-functions

    Fix misuses of format based logging functions

commit c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Merge: bca63b4 1cd12ef
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Wed Nov 19 14:52:01 2014 -0800

    Merge pull request #9144 from miminar/sigproxy_tty

    Corrected description of --sig-proxy

commit bca63b4f48a48ec3918862a8fc094e949f42038d
Merge: c8926bb bbb245d
Author: Alexander Morozov <lk4d4math@gmail.com>
Date:   Wed Nov 19 14:27:13 2014 -0800

    Merge pull request #9249 from tonistiigi/integration-cli-cleanup

    Make sure integration-cli tests clean up

commit 6705477673be7c303369778f6f288ee600ce3893
Author: Tonis Tiigi <tonistiigi@gmail.com>
Date:   Wed Nov 19 23:24:16 2014 +0200

    Fix misuses of format based logging functions

    Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)

commit bbb245defe670f4fd9b9159b154e0ba5aa93ec87
Author: Tonis Tiigi <tonistiigi@gmail.com>
Date:   Mon Nov 17 18:06:48 2014 +0200

    Fix deleteImages() helper for multiple names

    Pass every image name as separate argument.

    Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)

commit ce86d5ae6826b0ec3dcf3188f8a6bd37b0afd3b2
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Tue Nov 18 14:44:05 2014 -0800

    Adapt project/make.sh for Windows builds

    Fixes:
    - link -H windows is not compatible with -linkmode external
    - under Cygwin go does not play well with cygdrive type paths

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit da3d3b97ebe1e6fe1254367521c725ca12a5e61d
Author: Tonis Tiigi <tonistiigi@gmail.com>
Date:   Mon Nov 17 18:05:49 2014 +0200

    Make sure integration-cli test clean up

    Common patterns:
    - Multiple images were built with same name but only one cleanup.
    - Containers were deleted after images.
    - Images not removed after retagging.

    Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)

commit e257863a9a2bff19c66355230483a8b6fa9de209
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Wed Nov 19 12:15:20 2014 -0800

    Add unit test for tarSum.Sum() with no data

    Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

commit 6a74f071afb4a69a1360ff1e84945745e578c349
Author: Vincent Batts <vbatts@redhat.com>
Date:   Wed Nov 19 15:46:03 2014 -0500

    pkg/tarsum: actually init the TarSum struct

    closes #9241

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit 1cd12efb5d0065990334de4f97fa85b317f97f11
Author: Michal Minar <miminar@redhat.com>
Date:   Wed Nov 19 09:08:39 2014 +0100

    Updated sig-proxy text also in zsh completion script

    Signed-off-by: Michal Minar <miminar@redhat.com>

commit 3287ca1e45f74a2eac214070ccb937c7c7030a06
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Tue Nov 18 15:07:48 2014 -0500

    overlayfs: more helpful output when not supported

    based on https://github.com/docker/docker/pull/7619#discussion_r20385086

    Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>

commit c8926bb5792ebea6e7b16935fa7fce577446574a
Merge: af54dc2 a3068a1
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Tue Nov 18 18:23:33 2014 -0800

    Merge pull request #9203 from somaopensource/fix_link

    fix link to PACKAGERS.md

commit f4acfeebda431239c98e07ed8c0d55422e165d4e
Author: Chun Chen <chenchun.feed@gmail.com>
Date:   Wed Nov 19 10:13:10 2014 +0800

    Clean config path of bind mount volume

    Signed-off-by: Chun Chen <chenchun.feed@gmail.com>

commit 57b6993c2c99dd89a3cbe012935a82966d88aa92
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Mon Nov 17 16:41:54 2014 -0800

    If an image has more than one repo name or tag, it'll be listed more than once

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit a0fb8eca30fd97aaa592268b4b6e8ac7737b78ac
Author: Sven Dowideit <SvenDowideit@home.org.au>
Date:   Tue Nov 18 17:42:25 2014 -0800

    tlsverify flag has no dash

    Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

commit af54dc215f08ef1a56eaef54e8e4cc5e6f7d21a9
Merge: 1bac8f5 f9cdad3
Author: James Turnbull <james@lovedthanlost.net>
Date:   Tue Nov 18 20:25:36 2014 -0500

    Merge pull request #9219 from acbodine/cleanup-remote-api-docs-start

    Cleanup: fixes start response status code typo in examples

commit 1bac8f5322b1ec300326a7eaac18f712c385b5b2
Merge: f676891 b36bf98
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Tue Nov 18 17:24:16 2014 -0800

    Merge pull request #9039 from ashahab-altiscale/8617-lxc-volume

    Have lxc create mount points if they don't exist

commit f676891192670df3e5c79c4612a86186329d658f
Merge: 0722c9b f12b7b4
Author: Victor Vieux <victorvieux@gmail.com>
Date:   Tue Nov 18 17:21:22 2014 -0800

    Merge pull request #8905 from 13W/x-registry-auth

    allow to use x-registry-auth header with enabled cors

commit 0722c9b536a6f9617f77090bfc78b9c583a1b8d1
Merge: e393ca6 ab7a654
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Tue Nov 18 16:31:07 2014 -0800

    Merge pull request #9187 from icecrime/update_authors_file

    Update AUTHORS file

commit e393ca672ed71ff778db284517593bab680a79c4
Merge: ca4be11 54a6e6d
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Tue Nov 18 16:56:56 2014 -0700

    Merge pull request #9218 from tianon/check-overlayfs

    Add CONFIG_OVERLAYFS_FS to check-config.sh

commit ca4be114e9f8b38805f7f16f58fe2d8468c95bfe
Merge: 9854b0a 7fe8d0a
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Tue Nov 18 15:29:33 2014 -0800

    Merge pull request #9216 from jfrazelle/typo-steam

    Fix steam where it should be stream.

commit 9854b0aa40eb3261d599604915c909cebcc60179
Merge: 660eada aeeb0d5
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Tue Nov 18 16:20:42 2014 -0700

    Merge pull request #8150 from dqminh/pull-output-non-terminal

    Pull: print some data instead of newlines when output is not a terminal

commit 33e0de15d77ef57b5c4615c6bd535775d54d8c9b
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Tue Nov 18 15:13:35 2014 -0700

    Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap

    Signed-off-by: Andrew Page <admwiggin@gmail.com>

commit f9cdad32721808b6beeab544de26cca9ff68e1f0
Author: Andrew C. Bodine <acbodine@us.ibm.com>
Date:   Tue Nov 18 11:32:23 2014 -0800

    Cleanup: fixes start response status code typo in examples

    Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>

commit 54a6e6d1229adb1169809493af89600c5ccc70ae
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Tue Nov 18 12:20:49 2014 -0700

    Add CONFIG_OVERLAYFS_FS to check-config.sh

    Also, added some slight adjustment to the AUFS_FS output/note to make it more clear what it applies to.

    Example output:
    ```console
    $ ./contrib/check-config.sh
    info: reading kernel config from /proc/config.gz ...

    Generally Necessary:
    - cgroup hierarchy: properly mounted [/sys/fs/cgroup]
    - CONFIG_NAMESPACES: enabled
    - CONFIG_NET_NS: enabled
    - CONFIG_PID_NS: enabled
    - CONFIG_IPC_NS: enabled
    - CONFIG_UTS_NS: enabled
    - CONFIG_DEVPTS_MULTIPLE_INSTANCES: enabled
    - CONFIG_CGROUPS: enabled
    - CONFIG_CGROUP_CPUACCT: enabled
    - CONFIG_CGROUP_DEVICE: enabled
    - CONFIG_CGROUP_FREEZER: enabled
    - CONFIG_CGROUP_SCHED: enabled
    - CONFIG_MACVLAN: enabled
    - CONFIG_VETH: enabled
    - CONFIG_BRIDGE: enabled
    - CONFIG_NF_NAT_IPV4: enabled
    - CONFIG_IP_NF_FILTER: enabled
    - CONFIG_IP_NF_TARGET_MASQUERADE: enabled
    - CONFIG_NETFILTER_XT_MATCH_ADDRTYPE: enabled
    - CONFIG_NETFILTER_XT_MATCH_CONNTRACK: enabled
    - CONFIG_NF_NAT: enabled
    - CONFIG_NF_NAT_NEEDED: enabled

    Optional Features:
    - CONFIG_MEMCG_SWAP: enabled
    - CONFIG_RESOURCE_COUNTERS: enabled
    - CONFIG_CGROUP_PERF: missing
    - Storage Drivers:
      - "aufs":
        - CONFIG_AUFS_FS: missing
          (note that some kernels include AUFS patches but not the AUFS_FS flag)
        - CONFIG_EXT4_FS_POSIX_ACL: enabled
        - CONFIG_EXT4_FS_SECURITY: enabled
      - "btrfs":
        - CONFIG_BTRFS_FS: enabled
      - "devicemapper":
        - CONFIG_BLK_DEV_DM: enabled
        - CONFIG_DM_THIN_PROVISIONING: enabled
        - CONFIG_EXT4_FS: enabled
        - CONFIG_EXT4_FS_POSIX_ACL: enabled
        - CONFIG_EXT4_FS_SECURITY: enabled
      - "overlayfs":
        - CONFIG_OVERLAYFS_FS: missing
    ```

    Signed-off-by: Andrew Page <admwiggin@gmail.com>

commit 7fe8d0aeeb373a0fef92758819d8054fbd744ea5
Author: Jessica Frazelle <jess@docker.com>
Date:   Tue Nov 18 10:49:01 2014 -0800

    Fix steam where it should be stream.

    Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

commit b4346c4810c4801e8885485b2bf0311f1b6d00ec
Author: Doug Davis <dug@us.ibm.com>
Date:   Sun Nov 16 05:13:14 2014 -0800

    Be clearer in docs about COPY/ADD dirs
    COPY/ADD just copies the contents of dirs, not dirs themselves.
    This PR tries to clear that up in the docs.

    Closes #8775

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit 660eadae3d56195e05da170593af50f0d7752706
Merge: 4fff150 b273c44
Author: James Turnbull <james@lovedthanlost.net>
Date:   Tue Nov 18 01:17:48 2014 -0500

    Merge pull request #9189 from satnam6502/docfix

    Consistently use sudo docker

commit 4fff1505eb00cf679792b2e064dc1fa08a9c6587
Merge: 379c0da bdaa76e
Author: James Turnbull <james@lovedthanlost.net>
Date:   Tue Nov 18 01:16:27 2014 -0500

    Merge pull request #9193 from somaopensource/docs_misspelling

    Fix misspelling

commit e6fd57b90bcdd3b0105fa5c7d17a64332f829ded
Author: Marianna <mtesselh@gmail.com>
Date:   Mon Nov 17 19:25:06 2014 -0800

    Fixed a bug - no panic anymore when logining in without TTY

    Fixes #8956

    Signed-off-by: Marianna <mtesselh@gmail.com>

commit 379c0da4648f7a8d62740b5c217cfac58f45ca10
Merge: 17dfa12 83d7db3
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 17 18:25:00 2014 -0800

    Merge pull request #8937 from vbatts/vbatts-mount_optional_fields

    pkg/mount: include optional field

commit 17dfa126baabb7300e4a5193689cde01ece24747
Merge: e2d08bd ac40e7c
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Mon Nov 17 18:08:52 2014 -0800

    Merge pull request #9204 from jfrazelle/9056-rmi

    Fix for rmi throws error "no such id".

commit e2d08bd5ead101bdb58868492179f0bbe72547f3
Merge: 882db5f 91fb9b2
Author: Sven Dowideit <SvenDowideit@users.noreply.github.com>
Date:   Mon Nov 17 17:24:58 2014 -0800

    Merge pull request #8749 from brahmaroutu/resize_uponstart_8728_2

    Fix the documentation and integration test for container resize

commit b273c447e0f0b124d5f81ff60033a4894e2acec8
Author: Satnam Singh <satnam@raintown.org>
Date:   Sat Nov 15 22:40:48 2014 -0800

    Consistently use sudo docker

    Signed-off-by: Satnam Singh <satnam@raintown.org>

commit ac40e7cbb3cf01568b3763abe04af814d89a6f36
Author: Jessica Frazelle <jess@docker.com>
Date:   Mon Nov 17 13:16:33 2014 -0800

    Fix for rmi -f when error "no such id". (9056)

    Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

commit 882db5f8858f36e213feabda459e6b5e639c5c85
Merge: 3527d5b 6dc11cc
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 17 17:42:27 2014 -0700

    Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer

    makes the -s --size option documentation clearer #8950

commit 3527d5b817637bea162cfc84b06534a4a20ca464
Merge: ecaba0e 975fa54
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 17 16:49:35 2014 -0700

    Merge pull request #9205 from crosbymichael/update-libcontainer-nov17

    Update libcontainer to 28cb5f9dfd6f3352c610a4f1502

commit a0605107d713f7f8a25277b06369134d17781077
Author: Jessica Frazelle <jess@docker.com>
Date:   Mon Nov 17 12:49:29 2014 -0800

    Add test for bug (9056) where rmi -f fails with "no such id".

    Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

commit 83d7db3e505f2d080ac78ca7777937c812588003
Author: Vincent Batts <vbatts@redhat.com>
Date:   Mon Nov 17 16:17:06 2014 -0500

    pkg/mount: testing mountinfo fields

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit 975fa5487ca531374fed421b52de1adf133c9810
Author: Michael Crosby <crosbymichael@gmail.com>
Date:   Mon Nov 17 12:16:37 2014 -0800

    Update libcontainer to 28cb5f9dfd6f3352c610a4f1502

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

commit a3068a109cc2c472966d5a080f81ca344232f26c
Author: Daehyeok Mun <daehyeok@gmail.com>
Date:   Tue Nov 18 05:03:00 2014 +0900

    fix link to PACKAGERS.md
    fix link from /hack/PACKAGERS.md to /project/PACKAGERS.md

    Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>

commit ecaba0eb4abd5ad26eb07f7ac89a16b8914347fa
Merge: 34cb92e d5098fd
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Mon Nov 17 12:53:23 2014 -0700

    Merge pull request #9197 from somaopensource/remove_obsolete_comment

    Remove obsolete comments

commit 8545155c41b1ccc22056733539660b1afa6790ef
Author: Victor Vieux <vieux@docker.com>
Date:   Mon Nov 17 19:26:39 2014 +0000

    add docs

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Author: Victor Vieux <vieux@docker.com>
Date:   Mon Nov 17 19:23:41 2014 +0000

    add ID and Hostname in docker info

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 91fb9b2f5a07232cecfcde38a98c3ec6410239b7
Author: Srini Brahmaroutu <sbrahma@us.ibm.com>
Date:   Fri Oct 24 04:27:09 2014 +0000

    Fix the documentation and integration test for container resize
    Closes #8728

    Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>

commit d5098fde9a64fdec2098c7a0c6bd777f88f7d4c9
Author: Daehyeok Mun <daehyeok@gmail.com>
Date:   Mon Nov 17 23:27:03 2014 +0900

    Remove obsolete comments
    In the below comment line, already codes for log exists so
    following comment is obsolete.
    // TODO log

    Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>

commit ab7a6544b09c0b061e35aa7df766ef7adc1fd2fe
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Sat Nov 15 14:53:11 2014 -0800

    Update AUTHORS file

    Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

commit 34cb92e2d49e2c141a67cd5df73a54c1655b2842
Merge: 61e4b4e 4c97832
Author: Arnaud Porterie <arnaud.porterie@docker.com>
Date:   Sun Nov 16 22:10:40 2014 -0800

    Merge pull request #8699 from shuai-z/fix-portalloc

    Fix corner cases in ipallocator and portallocator

commit bdaa76e8cf3baeeaa645d91aed168028301f537f
Author: Daehyeok Mun <daehyeok@gmail.com>
Date:   Mon Nov 17 04:23:22 2014 +0900

    Fix misspelling
    Fix misspelling from independant to independent

    Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>

commit 61e4b4e1d015032e6e7ee17658023c4101be3e36
Merge: 08201d0 2facc04
Author: Alexandr Morozov <lk4d4math@gmail.com>
Date:   Sat Nov 15 10:53:31 2014 -0800

    Merge pull request #8335 from duglin/Issue5198

    Add --log-level support - Issue #5198

commit 08201d021ea70bd928d57f685f43d4ec2d0e729b
Merge: 8682bac b7703a9
Author: Tibor Vass <teabee89@gmail.com>
Date:   Sat Nov 15 10:40:31 2014 -0800

    Merge pull request #9113 from Azure/windows-client

    Windows port of Docker Client

commit 2facc0467336a80f48c765dbdbd803055a431aa9
Author: Doug Davis <dug@us.ibm.com>
Date:   Wed Oct 1 06:07:24 2014 -0700

    Add --log-level support

    Next steps, in another PR, would be:
    - make all logging go through the logrus stuff
    - I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see

    Closes #5198

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit edc6df256d21eb1d1aa36b241dcc6d4b83d58d75
Author: Vivek Goyal <vgoyal@redhat.com>
Date:   Fri Nov 14 18:15:56 2014 -0500

    devmapper: Call UdevWait() even in failure path

    Currently we set up a cookie and upon failure not call UdevWait(). This
    does not cleanup the cookie and associated semaphore and system will
    soon max out on total number of semaphores.

    To avoid this, call UdevWait() even in failure path which in turn will
    cleanup associated semaphore.

    Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit b7703a992e14255a5972bf157d0c2cfc0da3d53f
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Mon Oct 27 22:05:57 2014 -0700

    Add windows/(386,amd64) to cross platforms list

    Edited make scripts to append .exe to windows binary

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit 5a38680bd2283c87848d2e7f62a14f0261291c7c
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Wed Oct 29 15:46:45 2014 -0700

    Fix input volume path check on Windows

    used path package instead of path/filepath so that --volumes and
    --device parameters to always validate paths as unix paths instead of
    OS-dependent path convention

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit d4dbb708320e59efa91b077303c87f9e9513cd91
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Tue Oct 21 16:15:26 2014 -0700

    Use USERPROFILE path on Windows as home directory

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit e45b0f92711ff190cff4b61b2ea80cdd53203a16
Author: John Gossman <johngos@microsoft.com>
Date:   Thu Oct 30 09:35:49 2014 -0700

    Remove unused sysinfo parameter to runconfig.Parse

    Removing dead code.

    Signed-off-by: John Gossman <johngos@microsoft.com>

commit 2180aa4f6f2ad4d8f284d63ee29e93547263976e
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Thu Nov 13 12:36:05 2014 -0800

    Refactor pkg/archive with a platform-independent stat struct

    pkg/archive contains code both invoked from cli (cross platform) and
    daemon (linux only) and Unix-specific dependencies break compilation on
    Windows. We extracted those stat-related funcs into platform specific
    implementations at pkg/system and added unit tests.

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit 3d2fae353f6ddc819d3a3c4db80887a40ac6f5f0
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Thu Nov 13 12:00:04 2014 -0800

    Extract mknod, umask, lstat to pkg/system

    Some parts of pkg/archive is called on both client/daemon code. To get
    it compiling on Windows, these funcs are extracted into files with
    build tags.

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit b64c9b521ab4e4082ed874a23a493f4a266304d5
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Thu Nov 13 10:50:57 2014 -0800

    Extract TreeSize to daemon build

    TreeSize uses syscall.Stat_t which is not available on Windows.
    It's called only on daemon path, therefore extracting it to daemon
    with build tag 'daemon'

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit 376ae7780bf04d89ad1532f1c2a752535fa7ac7d
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Thu Nov 13 10:48:19 2014 -0800

    Consolidate tmpdir implementations, include Windows

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit 91a86670aac52d916c81a818aff3dfcf445da83e
Author: Ahmet Alp Balkan <ahmetb@microsoft.com>
Date:   Thu Nov 13 10:40:22 2014 -0800

    Extract client signals to pkg/signal

    SIGCHLD and SIGWINCH used in api/client (cli code) are not
    available on Windows. Extracting into separate files with build
    tags.

    Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

commit 975b6e598d44408c865993bbb650cc7117133ffc
Author: John Gossman <johngos@microsoft.com>
Date:   Thu Oct 23 16:44:57 2014 -0700

    Refactor pkg/term package for Windows tty support

    Signed-off-by: John Gossman <johngos@microsoft.com>

commit 8682bac309cc46ca31fa35d93a8045061aba5b0f
Merge: c89062b 6d97339
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 14 17:35:07 2014 -0800

    Merge pull request #9151 from tonistiigi/aufs-clipping-fix

    Fix AUFS silent mount errors on many layers

commit c89062bafc2262c5efeee905bafb72be57873478
Merge: b7ca8f6 cef27e1
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 14 16:56:02 2014 -0800

    Merge pull request #9164 from vbatts/vbatts-dm_removedevice

    pkg/devicemapper: cleanup removeDevice differences

commit b7ca8f6f732c022a960a555d685a5effd525b086
Merge: 10c0e72 32e61b8
Author: Solomon Hykes <s@docker.com>
Date:   Fri Nov 14 15:23:19 2014 -0800

    Merge pull request #9178 from shykes/hack-to-project

    Rename hack to project

commit 10c0e72de8c16269cff6b8b0d5a81c5510bac731
Merge: d32d930 4cf0aa7
Author: Solomon Hykes <s@docker.com>
Date:   Fri Nov 14 15:15:21 2014 -0800

    Merge pull request #9177 from shykes/hack-docs-small-improvements

    Small improvements to contribution docs

commit d32d9300edc62ebc7c5268544a77b01ebcb40961
Merge: 3650398 460036c
Author: Solomon Hykes <s@docker.com>
Date:   Fri Nov 14 14:52:17 2014 -0800

    Merge pull request #9116 from erikh/update_contributing

    Update CONTRIBUTING to reflect new PR-docs process.

commit 36503981f009e914c9913613d3666824f6c492a0
Merge: 25643f8 5937663
Author: Tibor Vass <teabee89@gmail.com>
Date:   Fri Nov 14 13:45:48 2014 -0800

    Merge pull request #9100 from tiborvass/insecure-registry-cidr

    Add the possibility of specifying a subnet for --insecure-registry

commit 25643f8932eeaa33b67871247b2f19944a169831
Merge: 8bb6957 3ec623e
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 14 13:29:34 2014 -0800

    Merge pull request #9172 from vbatts/vbatts-dm_maintainer

    pkg/devicemapper: missed MAINTAINERS on split

commit 8bb6957d3bd6fb1d201702330418595ad4b0a1e2
Merge: 916a10d b433680
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Nov 14 14:10:20 2014 -0700

    Merge pull request #9165 from hansrodtang/master

    Updated cover tool import path.

commit 916a10dd91d7113d65a3aef8316643d913fbaaf7
Merge: df603eb 453552c
Author: unclejack <unclejack@users.noreply.github.com>
Date:   Fri Nov 14 22:59:59 2014 +0200

    Merge pull request #7619 from alexlarsson/overlayfs

    Add overlayfs graph backend

commit 5937663a08d9e7ddc9347c4fc33a506d3d596ccd
Author: Tibor Vass <teabee89@gmail.com>
Date:   Fri Nov 14 11:04:47 2014 -0800

    Rewrite documentation for insecure registries

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

commit 6aba75db4e7b0151aeb48f450bb43e659ce0ec82
Author: Tibor Vass <teabee89@gmail.com>
Date:   Tue Nov 11 16:31:15 2014 -0500

    Add the possibility of specifying a subnet for --insecure-registry

    Signed-off-by: Tibor Vass <teabee89@gmail.com>

commit cef27e1d6c0bd302e1c58e9478a0fba99fd3a2d0
Author: Vincent Batts <vbatts@redhat.com>
Date:   Fri Nov 14 14:18:35 2014 -0500

    pkg/devicemapper: defer udev wait during removal

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit df603eb4e400f9ed4fa88d956f53ad80b244c376
Merge: 07996d8 454f56e
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 14 12:07:22 2014 -0800

    Merge pull request #9108 from vieux/handle_redirects

    handle GET redirects over HTTP

commit 454f56e37eefd072e350739a6c5a06743ff913ef
Author: Victor Vieux <vieux@docker.com>
Date:   Fri Nov 14 19:31:52 2014 +0000

    use _, _ string

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 07996d82c76f0c73555d4de27371757e8879d378
Merge: 7b7af6d 497fc88
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Fri Nov 14 10:34:00 2014 -0800

    Merge pull request #9074 from rhatdan/shm

    Allow IPC namespace to be shared between containers or with the host

commit 3ec623ee2fc503a6236a7b0edde5dd6abb967e49
Author: Vincent Batts <vbatts@redhat.com>
Date:   Fri Nov 14 09:20:37 2014 -0500

    pkg/devicemapper: missed MAINTAINERS on split

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit b37fdc5dd1db196209ebb860c88a37d67bb2cf98
Author: Anthony Baire <Anthony.Baire@irisa.fr>
Date:   Tue Nov 11 10:18:22 2014 +0100

    fix missing layers when exporting a full repository

    Therer is a bug in the 'skip' decision when exporting a repository
    (`docker save repo`)

    Only the layers of the first image are included in the archive (the
    layers of the next images are missing)

    Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>

commit 7b7af6dbaeadb86c018a877af15c662786bc90c1
Merge: 70a3f4e dad5873
Author: unclejack <unclejack@users.noreply.github.com>
Date:   Fri Nov 14 15:39:51 2014 +0200

    Merge pull request #8999 from yoheiueda/test-unit-without-parallel

    Make test-unit runnable without parallel

commit 70a3f4e8e20faa2404172412a9f7bb9dfb288c37
Merge: 870a695 cbf2879
Author: James Turnbull <james@lovedthanlost.net>
Date:   Fri Nov 14 08:02:12 2014 -0500

    Merge pull request #9156 from pixelistik/patch-1

    Fix typo "infortmation" in docs for `docker run`

commit b4336803f35591c8e4d94b023c9d5e9525795520
Author: Hans Rødtang <hansrodtang@gmail.com>
Date:   Fri Nov 14 06:16:41 2014 +0100

    Updated cover tool import path.

    Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>

commit 870a695375b0035b2012dc25da55ca952b58c973
Merge: 967354d d7c37b5
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Nov 13 20:47:07 2014 -0800

    Merge pull request #9011 from vbatts/vbatts-btrfs_information

    btrfs: information for the information gods

commit c9a76622086cf6019b3ec71ae53fc71c0396a1ef
Author: Vincent Batts <vbatts@redhat.com>
Date:   Thu Nov 13 17:20:24 2014 -0500

    pkg/devicemapper: cleanup removeDevice differences

    Fixes failure on RemoveDevice when host is AUFS, and running
    devicemapper test docker-in-docker

    https://gist.github.com/tonistiigi/59559cbfb3f2df26b29c

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit 967354d48818eebf9ce706bbd4914a20a0375de8
Merge: 5c863f9 4f5be9d
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 13 19:08:32 2014 -0800

    Merge pull request #9131 from vieux/empty_lines_dockerinfo

    Do not display empty lines in docker info if the key doesn't exists

commit 4f5be9da86ffed40b810bb1840c19526a9156ab3
Author: Victor Vieux <vieux@docker.com>
Date:   Thu Nov 13 01:32:38 2014 +0000

    Do not display empty lines in docker info if the key doesn't exists

    Signed-off-by: Victor Vieux <vieux@docker.com>

commit 5c863f983df6ebc913890bd6095cc47d8a3a624b
Merge: 039aa27 adb07b5
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 13 18:25:38 2014 -0800

    Merge pull request #9107 from ashahab-altiscale/9062-linked-container

    Share network namespace of containers with lxc

commit 039aa2741fa95ecb21e35a20d60d72018d8296c9
Merge: 3aa2245 059e589
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 13 18:07:20 2014 -0800

    Merge pull request #8964 from jlhawn/image_checksum

    Compute TarSum on storage of image layer content

commit 3aa2245914ea73f19838adbb09d0617984fbeb11
Merge: b0d219e a7aa2c8
Author: unclejack <unclejack@users.noreply.github.com>
Date:   Fri Nov 14 01:12:22 2014 +0200

    Merge pull request #8869 from jlhawn/tarsum_version

    Finalize TarSum Version 1 w/ refactor

commit cbf2879349bd6cc3b43f89733a9b81f55bd0c495
Author: pixelistik <pixelistik@users.noreply.github.com>
Date:   Thu Nov 13 23:26:49 2014 +0100

    Fix typo "infortmation" in docs for `docker run`

commit d7c37b5a28de6e7c0a9270815c092a45d8d7fef7
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Thu Nov 13 16:25:10 2014 -0500

    Dockerfile: buildtags for old btrfs

    Since the build uses ubuntu 14.04, which has an old btrfs, include the
    buildtags needed for this old version to not break the build.

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit 25154682a5cd57aa4fc3ef88baeee3ce1f204060
Author: Vincent Batts <vbatts@redhat.com>
Date:   Thu Nov 6 15:56:13 2014 -0500

    btrfs: build tag to enable showing version info

    be default it is on, with build tags to disable the version info

    Signed-off-by: Vincent Batts <vbatts@redhat.com>

commit b0d219eef0311450306ff5a48ecb0ecee1ce49cc
Merge: 06899e0 912b0f0
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Nov 13 12:52:36 2014 -0800

    Merge pull request #9152 from duglin/DockerBuildEnvs

    Allow a few more DOCKER_* env vars to pass thru Makefile

commit 06899e08109b5d1c8e7fa69afed7cc117f9589a9
Merge: 447a1a9 5cd5319
Author: Jessie Frazelle <jfrazelle@users.noreply.github.com>
Date:   Thu Nov 13 12:24:22 2014 -0800

    Merge pull request #9064 from recursive-madman/patch-1

    Proposed fix for #8979

commit 447a1a9bad0a9f928e4a30853679255cb02d254f
Merge: b9fb978 fbe10c8
Author: Vincent Batts <vbatts@hashbangbash.com>
Date:   Thu Nov 13 14:59:26 2014 -0500

    Merge pull request #9104 from tiborvass/issecure-check-in-new-endpoint

    registry: refactor registry.IsSecure calls into registry.NewEndpoint

commit b9fb9787b6db5332944d9d0f1fc42eae77d34b7d
Merge: e4105e4 0e217c4
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 13 11:54:16 2014 -0800

    Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields

    pkg/mount: adding fields supported by freebsd

commit e4105e4535de0ddb1a0e3ddbc646429c5c8ab5ec
Merge: 70e3cdc 7a3a938
Author: Michael Crosby <crosby.michael@gmail.com>
Date:   Thu Nov 13 11:26:29 2014 -0800

    Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree

    pkg/mount: sharedsubtree options and testing

commit 912b0f0f73346bf93c4feb32c84c62c18ee62dbc
Author: Doug Davis <dug@us.ibm.com>
Date:   Thu Nov 13 11:06:50 2014 -0800

    Allow a few more DOCKER_* env vars to pass thru Makefile

    I was trying to just build the Docker client but DOCKER_CLIENTONLY wasn't
    getting passed thru from the shell to the container building docker.

    So, this PR passes this var (via the -e option) on the docker run command
    so we pick it up from the devs shell when running "make ...".

    While in there I pulled all of the "-e" options into a new Makefile variable
    so its easy to see just the list of env vars we pass along.

    Signed-off-by: Doug Davis <dug@us.ibm.com>

commit 6d97339ca23ada27812572016ad4ff9ccffa8b09
Author: Tonis Tiigi <tonistiigi@gmail.com>
Date:   Thu Nov 13 19:57:28 2014 +0200

    Fix AUFS silent mount errors on many layers

    Fixes #1171
    Fixes #6465

    Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous
    implementation checked if error was returned and then started to append layers
    one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the
    permission sections or in xino definition the call would not error and
    remaining layers would just be skipped(or some other unknown situation).

    This also optimizes system calls as it tries to mount as much as possible with
    the f…
8b1c935
@agherzan
Contributor

I can reproduce this on 1.10.3 . Any reason why this is closed?

@cpuguy83
Contributor

@agherzan If you are reproducing a 42-layer issue, then most likely it's due to how your aufs kernel module is compiled.
We do have a 127 layer hard limit for all storage drivers, however.

What's your setup?

@agherzan
Contributor
agherzan commented Nov 10, 2016 edited

Are you referring to the max branch config of aufs? @cpuguy83

EDIT: I run docker 1.10.3 on an armv7 board, aufs, linux 4.1.15, 42 layers

@cpuguy83
Contributor

@agherzan Yes.

@agherzan
Contributor

@cpuguy83 I have 127

CONFIG_AUFS_FS=y
CONFIG_AUFS_BRANCH_MAX_127=y

@agherzan
Contributor
agherzan commented Nov 11, 2016 edited

Just for reference I will tell here what happened in my case for people to benefit from it.

I was using golang 1.6 which hardcodes the page size of arm64 to 64. This made docker generate aufs mount commands that would make options not fit in 4K. In my case the kernel is configured without 64K page size support so mount command would return invalid argument due to string truncation as it uses a page size as maximum option size.

There are some patches in master (of golang) which removes this static behaviour and detects the pagesize at runtime. (https://go-review.googlesource.com/#/c/25021/) Backporting these fixed my problem.

@cpuguy83
Contributor

@agherzan Thanks for the report!
I assume you mean go 1.6 and not docker 1.6?

@agherzan
Contributor

Edited to clarify @cpuguy83 . Typo.

@cpuguy83
Contributor

Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment