Michael Crosby
4faf5170e1
Merge pull request #9164 from vbatts/vbatts-dm_removedevice
...
pkg/devicemapper: cleanup removeDevice differences
Upstream-commit: c89062bafc2262c5efeee905bafb72be57873478
Component: engine
2014-11-14 16:56:02 -08:00
Derek McGowan
4f05e6fed5
Skip V2 registry and immediately fallback to V1 when mirrors are provided
...
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 87f59e3802a44aecdb8febfd34a9661e136ffcf4
Component: engine
2014-11-14 15:30:58 -08:00
Solomon Hykes
0ffaa22233
Merge pull request #9178 from shykes/hack-to-project
...
Rename hack to project
Upstream-commit: b7ca8f6f732c022a960a555d685a5effd525b086
Component: engine
2014-11-14 15:23:19 -08:00
Solomon Hykes
f6755ffa06
Merge pull request #9177 from shykes/hack-docs-small-improvements
...
Small improvements to contribution docs
Upstream-commit: 10c0e72de8c16269cff6b8b0d5a81c5510bac731
Component: engine
2014-11-14 15:15:21 -08:00
Solomon Hykes
bfa27e5a44
Merge pull request #9116 from erikh/update_contributing
...
Update CONTRIBUTING to reflect new PR-docs process.
Upstream-commit: d32d9300edc62ebc7c5268544a77b01ebcb40961
Component: engine
2014-11-14 14:52:17 -08:00
Tibor Vass
9fbae76eab
Rewrite documentation for insecure registries
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/reference/commandline/cli.md
Upstream-commit: c650d17a266f3fec3c48d7e3c79afe13a6ec139a
Component: engine
2014-11-14 14:20:19 -08:00
Tibor Vass
a38625e9ef
Add the possibility of specifying a subnet for --insecure-registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/endpoint.go
Upstream-commit: 5e2d02ab73c06aec4ddeca6965dee3ef3cf6a04e
Component: engine
2014-11-14 14:20:19 -08:00
Tibor Vass
5382572e9b
registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: eb3738347ade64c2b14995c30b400bc6aa48b84e
Component: engine
2014-11-14 14:20:19 -08:00
Tibor Vass
1bcf92b686
Put mock registry address in insecureRegistries for unit tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/registry_mock_test.go
Upstream-commit: 6152460c1e4c058676476314320b17e54de0c621
Component: engine
2014-11-14 14:20:19 -08:00
Tibor Vass
1d906bed7b
registry: refactor registry.IsSecure calls into registry.NewEndpoint
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/endpoint.go
registry/endpoint_test.go
registry/registry_test.go
Upstream-commit: 1527979e87d361539c2791d4e89602aea3cce174
Component: engine
2014-11-14 14:05:31 -08:00
Tibor Vass
ab9824e5ea
Merge pull request #9100 from tiborvass/insecure-registry-cidr
...
Add the possibility of specifying a subnet for --insecure-registry
Upstream-commit: 36503981f009e914c9913613d3666824f6c492a0
Component: engine
2014-11-14 13:45:48 -08:00
Tibor Vass
46a36325cb
archive: prevent breakout in ApplyLayer
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 04175d07634600f2a5cf43dd197eb2a926aba8b9
Component: engine
2014-11-14 23:45:37 +02:00
Tibor Vass
8b11f8cf5c
archive: prevent breakout in Untar
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: a111eea20cad697bb58ebfbf455ee1670c7cf82c
Component: engine
2014-11-14 23:45:29 +02:00
Tibor Vass
0473c8a94e
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
Upstream-commit: ea361c0476d03f44051289d8e3c128d699c76acc
Component: engine
2014-11-14 23:44:20 +02:00
Michael Crosby
5e6c6e4025
Merge pull request #9172 from vbatts/vbatts-dm_maintainer
...
pkg/devicemapper: missed MAINTAINERS on split
Upstream-commit: 25643f8932eeaa33b67871247b2f19944a169831
Component: engine
2014-11-14 13:29:34 -08:00
Tianon Gravi
45609ac359
Merge pull request #9165 from hansrodtang/master
...
Updated cover tool import path.
Upstream-commit: 8bb6957d3bd6fb1d201702330418595ad4b0a1e2
Component: engine
2014-11-14 14:10:20 -07:00
unclejack
494d9ae520
Merge pull request #7619 from alexlarsson/overlayfs
...
Add overlayfs graph backend
Upstream-commit: 916a10dd91d7113d65a3aef8316643d913fbaaf7
Component: engine
2014-11-14 22:59:59 +02:00
Tibor Vass
d864c2f944
Rewrite documentation for insecure registries
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 5937663a08d9e7ddc9347c4fc33a506d3d596ccd
Component: engine
2014-11-14 12:32:56 -08:00
Tibor Vass
ea3d6b1b0d
Add the possibility of specifying a subnet for --insecure-registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 6aba75db4e7b0151aeb48f450bb43e659ce0ec82
Component: engine
2014-11-14 12:31:11 -08:00
Vincent Batts
b34358b506
pkg/devicemapper: defer udev wait during removal
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: cef27e1d6c0bd302e1c58e9478a0fba99fd3a2d0
Component: engine
2014-11-14 15:17:33 -05:00
Michael Crosby
ba50e8beb2
Merge pull request #9108 from vieux/handle_redirects
...
handle GET redirects over HTTP
Upstream-commit: df603eb4e400f9ed4fa88d956f53ad80b244c376
Component: engine
2014-11-14 12:07:22 -08:00
Victor Vieux
7632ac2e44
use _, _ string
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 454f56e37eefd072e350739a6c5a06743ff913ef
Component: engine
2014-11-14 19:31:52 +00:00
Michael Crosby
8582931138
Merge pull request #9074 from rhatdan/shm
...
Allow IPC namespace to be shared between containers or with the host
Upstream-commit: 07996d82c76f0c73555d4de27371757e8879d378
Component: engine
2014-11-14 10:34:00 -08:00
Brian Goff
c8b11faf50
Initialize volumes when container is created
...
Fixes #8942
Current behavior is that volumes aren't initialized until start.
Volumes still need to be initialized on start since VolumesFrom and
Binds can be passed in as part of HostConfig on start, however anything
that's already been initialized will just be skipped as is the current
behavior.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7107898d5cf0f86dc1c6dab29e9dbdad3edc9411
Component: engine
2014-11-14 11:37:03 -05:00
Vincent Batts
6149f196a8
pkg/devicemapper: missed MAINTAINERS on split
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 3ec623ee2fc503a6236a7b0edde5dd6abb967e49
Component: engine
2014-11-14 11:12:23 -05:00
Anthony Baire
3a9fe771ef
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 >
Upstream-commit: b37fdc5dd1db196209ebb860c88a37d67bb2cf98
Component: engine
2014-11-14 14:41:35 +01:00
unclejack
9599d52c6f
Merge pull request #8999 from yoheiueda/test-unit-without-parallel
...
Make test-unit runnable without parallel
Upstream-commit: 7b7af6dbaeadb86c018a877af15c662786bc90c1
Component: engine
2014-11-14 15:39:51 +02:00
James Turnbull
4a789162b2
Merge pull request #9156 from pixelistik/patch-1
...
Fix typo "infortmation" in docs for `docker run`
Upstream-commit: 70a3f4e8e20faa2404172412a9f7bb9dfb288c37
Component: engine
2014-11-14 08:02:12 -05:00
Hans Rødtang
69df5cc039
Updated cover tool import path.
...
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com >
Upstream-commit: b4336803f35591c8e4d94b023c9d5e9525795520
Component: engine
2014-11-14 06:16:41 +01:00
Jessie Frazelle
6f95500247
Merge pull request #9011 from vbatts/vbatts-btrfs_information
...
btrfs: information for the information gods
Upstream-commit: 870a695375b0035b2012dc25da55ca952b58c973
Component: engine
2014-11-13 20:47:07 -08:00
Vincent Batts
4798207faf
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 >
Upstream-commit: c9a76622086cf6019b3ec71ae53fc71c0396a1ef
Component: engine
2014-11-13 22:43:03 -05:00
Michael Crosby
bb5bcd8e79
Merge pull request #9131 from vieux/empty_lines_dockerinfo
...
Do not display empty lines in docker info if the key doesn't exists
Upstream-commit: 967354d48818eebf9ce706bbd4914a20a0375de8
Component: engine
2014-11-13 19:08:32 -08:00
Victor Vieux
f5a6597726
Do not display empty lines in docker info if the key doesn't exists
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4f5be9da86ffed40b810bb1840c19526a9156ab3
Component: engine
2014-11-14 02:50:34 +00:00
Michael Crosby
4567691298
Merge pull request #9107 from ashahab-altiscale/9062-linked-container
...
Share network namespace of containers with lxc
Upstream-commit: 5c863f983df6ebc913890bd6095cc47d8a3a624b
Component: engine
2014-11-13 18:25:38 -08:00
Michael Crosby
658637c073
Merge pull request #8964 from jlhawn/image_checksum
...
Compute TarSum on storage of image layer content
Upstream-commit: 039aa2741fa95ecb21e35a20d60d72018d8296c9
Component: engine
2014-11-13 18:07:20 -08:00
unclejack
4189659614
Merge pull request #8869 from jlhawn/tarsum_version
...
Finalize TarSum Version 1 w/ refactor
Upstream-commit: 3aa2245914ea73f19838adbb09d0617984fbeb11
Component: engine
2014-11-14 01:12:22 +02:00
pixelistik
0e182a21a4
Fix typo "infortmation" in docs for docker run
...
Upstream-commit: cbf2879349bd6cc3b43f89733a9b81f55bd0c495
Component: engine
2014-11-13 23:26:49 +01:00
Vincent Batts
5dc5f5a90b
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 >
Upstream-commit: d7c37b5a28de6e7c0a9270815c092a45d8d7fef7
Component: engine
2014-11-13 16:44:00 -05:00
Vincent Batts
baecd1f7fb
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 >
Upstream-commit: 25154682a5cd57aa4fc3ef88baeee3ce1f204060
Component: engine
2014-11-13 16:43:53 -05:00
Jessie Frazelle
e6274cf281
Merge pull request #9152 from duglin/DockerBuildEnvs
...
Allow a few more DOCKER_* env vars to pass thru Makefile
Upstream-commit: b0d219eef0311450306ff5a48ecb0ecee1ce49cc
Component: engine
2014-11-13 12:52:36 -08:00
Jessie Frazelle
aec65b5d89
Merge pull request #9064 from recursive-madman/patch-1
...
Proposed fix for #8979
Upstream-commit: 06899e08109b5d1c8e7fa69afed7cc117f9589a9
Component: engine
2014-11-13 12:24:22 -08:00
Vincent Batts
d79900f1e3
Merge pull request #9104 from tiborvass/issecure-check-in-new-endpoint
...
registry: refactor registry.IsSecure calls into registry.NewEndpoint
Upstream-commit: 447a1a9bad0a9f928e4a30853679255cb02d254f
Component: engine
2014-11-13 14:59:26 -05:00
Michael Crosby
007506732f
Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields
...
pkg/mount: adding fields supported by freebsd
Upstream-commit: b9fb9787b6db5332944d9d0f1fc42eae77d34b7d
Component: engine
2014-11-13 11:54:16 -08:00
Michael Crosby
3b4007ccd1
Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree
...
pkg/mount: sharedsubtree options and testing
Upstream-commit: e4105e4535de0ddb1a0e3ddbc646429c5c8ab5ec
Component: engine
2014-11-13 11:26:29 -08:00
Doug Davis
6e188415a0
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 >
Upstream-commit: 912b0f0f73346bf93c4feb32c84c62c18ee62dbc
Component: engine
2014-11-13 11:25:11 -08:00
Mike Snitzer
e0ca5a198f
devmapper: disable discards by default if dm.thinpooldev was specified
...
User may still enable discards by setting dm.blkdiscard=true
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: e49567ba729001c31fe71e4b715eed8f50d7ded9
Component: engine
2014-11-13 13:37:47 -05:00
Tonis Tiigi
e61d8cd073
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)
Upstream-commit: 6d97339ca23ada27812572016ad4ff9ccffa8b09
Component: engine
2014-11-13 20:13:13 +02:00
Daniel, Dao Quang Minh
839ed3517e
add test for exposing large number of ports
...
this test checks if exposing a large number of ports in Dockerfile properly
saves the port in configs. We dont actually expose a VERY large number of ports
here because the result is the same and it increases the test time by a few
seconds
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: 29be7b439ec4d0c8a54852ccbbe7b6bcf040e13f
Component: engine
2014-11-13 13:08:52 -05:00
Tianon Gravi
37ee14abc3
Merge pull request #8644 from tamsky/pull-7698-docfix
...
Add mention of e2fsprogs to runtime dependencies.
Upstream-commit: 70e3cdcdd9dba29fcbed71c772749655d5907be6
Component: engine
2014-11-13 11:07:13 -07:00
Tianon Gravi
56d604e1ed
Merge pull request #8960 from LK4D4/add_nf_filter_check
...
Add check for IP_NF_FILTER
Upstream-commit: abceeb2ef5b3dad2ae0a7ca658f15aef406e8560
Component: engine
2014-11-13 11:03:29 -07:00
Michael Crosby
Derek McGowan
Solomon Hykes
Tibor Vass
Tianon Gravi
unclejack
Vincent Batts
Victor Vieux
Brian Goff
Anthony Baire
James Turnbull
Hans Rødtang
Jessie Frazelle
pixelistik
Vincent Batts
Doug Davis
Mike Snitzer
Tonis Tiigi
Daniel, Dao Quang Minh