Solomon Hykes
d32d9300ed
Merge pull request #9116 from erikh/update_contributing
...
Update CONTRIBUTING to reflect new PR-docs process.
2014-11-14 14:52:17 -08:00
Tibor Vass
36503981f0
Merge pull request #9100 from tiborvass/insecure-registry-cidr
...
Add the possibility of specifying a subnet for --insecure-registry
2014-11-14 13:45:48 -08:00
Michael Crosby
25643f8932
Merge pull request #9172 from vbatts/vbatts-dm_maintainer
...
pkg/devicemapper: missed MAINTAINERS on split
2014-11-14 13:29:34 -08:00
Tianon Gravi
8bb6957d3b
Merge pull request #9165 from hansrodtang/master
...
Updated cover tool import path.
2014-11-14 14:10:20 -07:00
unclejack
916a10dd91
Merge pull request #7619 from alexlarsson/overlayfs
...
Add overlayfs graph backend
2014-11-14 22:59:59 +02:00
Tibor Vass
5937663a08
Rewrite documentation for insecure registries
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-14 12:32:56 -08:00
Tibor Vass
6aba75db4e
Add the possibility of specifying a subnet for --insecure-registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-14 12:31:11 -08:00
Vincent Batts
cef27e1d6c
pkg/devicemapper: defer udev wait during removal
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-14 15:17:33 -05:00
Michael Crosby
df603eb4e4
Merge pull request #9108 from vieux/handle_redirects
...
handle GET redirects over HTTP
2014-11-14 12:07:22 -08:00
Victor Vieux
454f56e37e
use _, _ string
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-14 19:31:52 +00:00
Michael Crosby
07996d82c7
Merge pull request #9074 from rhatdan/shm
...
Allow IPC namespace to be shared between containers or with the host
2014-11-14 10:34:00 -08:00
Vincent Batts
3ec623ee2f
pkg/devicemapper: missed MAINTAINERS on split
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-14 11:12:23 -05:00
Anthony Baire
b37fdc5dd1
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>
2014-11-14 14:41:35 +01:00
unclejack
7b7af6dbae
Merge pull request #8999 from yoheiueda/test-unit-without-parallel
...
Make test-unit runnable without parallel
2014-11-14 15:39:51 +02:00
James Turnbull
70a3f4e8e2
Merge pull request #9156 from pixelistik/patch-1
...
Fix typo "infortmation" in docs for `docker run`
2014-11-14 08:02:12 -05:00
Hans Rødtang
b4336803f3
Updated cover tool import path.
...
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
2014-11-14 06:16:41 +01:00
Jessie Frazelle
870a695375
Merge pull request #9011 from vbatts/vbatts-btrfs_information
...
btrfs: information for the information gods
2014-11-13 20:47:07 -08:00
Vincent Batts
c9a7662208
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>
2014-11-13 22:43:03 -05:00
Michael Crosby
967354d488
Merge pull request #9131 from vieux/empty_lines_dockerinfo
...
Do not display empty lines in docker info if the key doesn't exists
2014-11-13 19:08:32 -08:00
Victor Vieux
4f5be9da86
Do not display empty lines in docker info if the key doesn't exists
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-14 02:50:34 +00:00
Michael Crosby
5c863f983d
Merge pull request #9107 from ashahab-altiscale/9062-linked-container
...
Share network namespace of containers with lxc
2014-11-13 18:25:38 -08:00
Michael Crosby
039aa2741f
Merge pull request #8964 from jlhawn/image_checksum
...
Compute TarSum on storage of image layer content
2014-11-13 18:07:20 -08:00
unclejack
3aa2245914
Merge pull request #8869 from jlhawn/tarsum_version
...
Finalize TarSum Version 1 w/ refactor
2014-11-14 01:12:22 +02:00
pixelistik
cbf2879349
Fix typo "infortmation" in docs for `docker run`
2014-11-13 23:26:49 +01:00
Vincent Batts
d7c37b5a28
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>
2014-11-13 16:44:00 -05:00
Vincent Batts
25154682a5
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>
2014-11-13 16:43:53 -05:00
Jessie Frazelle
b0d219eef0
Merge pull request #9152 from duglin/DockerBuildEnvs
...
Allow a few more DOCKER_* env vars to pass thru Makefile
2014-11-13 12:52:36 -08:00
Jessie Frazelle
06899e0810
Merge pull request #9064 from recursive-madman/patch-1
...
Proposed fix for #8979
2014-11-13 12:24:22 -08:00
Vincent Batts
447a1a9bad
Merge pull request #9104 from tiborvass/issecure-check-in-new-endpoint
...
registry: refactor registry.IsSecure calls into registry.NewEndpoint
2014-11-13 14:59:26 -05:00
Michael Crosby
b9fb9787b6
Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields
...
pkg/mount: adding fields supported by freebsd
2014-11-13 11:54:16 -08:00
Michael Crosby
e4105e4535
Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree
...
pkg/mount: sharedsubtree options and testing
2014-11-13 11:26:29 -08:00
Doug Davis
912b0f0f73
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>
2014-11-13 11:25:11 -08:00
Tonis Tiigi
6d97339ca2
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)
2014-11-13 20:13:13 +02:00
Tianon Gravi
70e3cdcdd9
Merge pull request #8644 from tamsky/pull-7698-docfix
...
Add mention of e2fsprogs to runtime dependencies.
2014-11-13 11:07:13 -07:00
Tianon Gravi
abceeb2ef5
Merge pull request #8960 from LK4D4/add_nf_filter_check
...
Add check for IP_NF_FILTER
2014-11-13 11:03:29 -07:00
Alexandr Morozov
8f763a09d3
Merge pull request #9143 from coolljt0725/cleanup_defaulttag
...
Cleanup:change "latest" to graph.DEFAULTTAG
2014-11-13 09:00:00 -08:00
Sami Wagiaalla
a01f1e707e
Remove reference to 'ifaceName' from configureBridge comment.
...
The argument ifaceName was removed in a much earlier commit.
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
2014-11-13 10:19:56 -05:00
Tibor Vass
fbe10c83d8
registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-13 07:02:24 -08:00
Michal Minar
e71f241c4b
Corrected description of --sig-proxy
...
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.
Signed-off-by: Michal Minar <miminar@redhat.com>
2014-11-13 10:50:06 +01:00
Lei Jitang
3c3968692d
Cleanup:change latest to graph.DEFAULTTAG
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-11-13 16:21:34 +08:00
Victor Vieux
5fbfec333a
update timeout
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-13 03:21:18 +00:00
Tibor Vass
78e859f3c3
Put mock registry address in insecureRegistries for unit tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-12 20:34:03 -06:00
Tibor Vass
4455f51760
registry: refactor registry.IsSecure calls into registry.NewEndpoint
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-12 20:34:03 -06:00
Vincent Batts
42861f3b45
Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings
...
devicemapper: split out devicemapper bindings
2014-11-12 19:59:36 -05:00
Erik Hollensbe
460036cdef
Update CONTRIBUTING to reflect new PR-docs process.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-11-12 16:01:25 -08:00
Michael Crosby
9670871e01
Merge pull request #8982 from rhvgoyal/save-restore-device-id
...
Save restore device Id: issue #8978
2014-11-12 15:41:27 -08:00
Alexandr Morozov
e12572f265
Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
...
Cleanup api server creation
2014-11-12 15:37:34 -08:00
Erik Hollensbe
33382385c3
Merge pull request #9124 from erikh/secure-localhost
...
Secure localhost registry (carry of #8898 )
2014-11-12 15:25:15 -08:00
Solomon Hykes
2e27263aac
Merge pull request #9127 from vishh/maintainer
...
Adding Vish as a maintainer for daemon.
2014-11-12 15:02:17 -08:00
Vishnu Kannan
06bf79552d
Adding Vish as a maintainer for daemon code.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-11-12 22:55:32 +00:00