4c63170cab
In contribution docs, emphasize that bug reports are appreciated!
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 2d688b0a787d6f38de244ed1294b0ed91c3533ba
Component: engine
2014-11-09 21:41:12 +00:00
aa28c320f1
Improve "security reports" section in contribution docs.
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 543127e211ce60b53d554199fdbbd3fe7b85c1c6
Component: engine
2014-11-09 21:41:08 +00:00
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
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
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
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
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
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
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
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
7632ac2e44
use _, _ string
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 454f56e37eefd072e350739a6c5a06743ff913ef
Component: engine
2014-11-14 19:31:52 +00:00
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
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
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
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
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
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
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
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
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
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
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
0e182a21a4
Fix typo "infortmation" in docs for docker run
...
Upstream-commit: cbf2879349bd6cc3b43f89733a9b81f55bd0c495
Component: engine
2014-11-13 23:26:49 +01:00
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
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
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
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
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
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
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
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
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
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
1a54551b00
Merge pull request #9143 from coolljt0725/cleanup_defaulttag
...
Cleanup:change "latest" to graph.DEFAULTTAG
Upstream-commit: 8f763a09d339ae733b833a000fb4f73ce9dd5180
Component: engine
2014-11-13 09:00:00 -08:00
2e493e1f52
registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: fbe10c83d81843412fd3485a8d6bb75849de97d4
Component: engine
2014-11-13 07:02:24 -08:00
22cdb1d809
Cleanup:change latest to graph.DEFAULTTAG
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
2014-11-13 16:21:34 +08:00
a7280b07fa
update timeout
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 5fbfec333a90b86add1dcf6bd8d5fcb728d34cdf
Component: engine
2014-11-13 03:21:18 +00:00
fdd71c9652
Put mock registry address in insecureRegistries for unit tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 78e859f3c35d1f31e7d6f3ded9a414dc0fbb8eaa
Component: engine
2014-11-12 20:34:03 -06:00
166cb2e350
registry: refactor registry.IsSecure calls into registry.NewEndpoint
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 4455f517605f1fd7279bbe9547915f15c037997d
Component: engine
2014-11-12 20:34:03 -06:00
90c31c6725
Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings
...
devicemapper: split out devicemapper bindings
Upstream-commit: 42861f3b45733268da674b82bceb6deef67b5513
Component: engine
2014-11-12 19:59:36 -05:00
7feb0036aa
Update CONTRIBUTING to reflect new PR-docs process.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 460036cdefb3e452fd5e8d77724d0df55be31da5
Component: engine
2014-11-12 16:01:25 -08:00
d82839394f
Merge pull request #8982 from rhvgoyal/save-restore-device-id
...
Save restore device Id: issue #8978
Upstream-commit: 9670871e0166658c5b6982d3ccf79a82afb9442c
Component: engine
2014-11-12 15:41:27 -08:00
4981609d4e
Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
...
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
2014-11-12 15:37:34 -08:00
94f9b5175d
Merge pull request #9124 from erikh/secure-localhost
...
Secure localhost registry (carry of #8898 )
Upstream-commit: 33382385c3f58da82099f5c7fa39dd65cb8c8170
Component: engine
2014-11-12 15:25:15 -08:00
7635de650e
Merge pull request #9127 from vishh/maintainer
...
Adding Vish as a maintainer for daemon.
Upstream-commit: 2e27263aac36fa48b3d3dfcd7816bced9e4b00d4
Component: engine
2014-11-12 15:02:17 -08:00
e5982e367c
Adding Vish as a maintainer for daemon code.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 06bf79552d222ef6c4547ae8b0f3cb474a031c76
Component: engine
2014-11-12 22:55:32 +00:00
db22845d50
Merge pull request #9105 from stevenburgess/archiveCommentFix
...
Fix comment to match the arg name
Upstream-commit: 3ef2fc7f0f025d3e4fc97ccbcc75cbfa667ccb2d
Component: engine
2014-11-12 14:52:27 -08:00
a083823cc6
Merge pull request #8479 from vishh/OOM
...
Provide Out Of Memory information in container status
Upstream-commit: 08f5edce3092e55f90116fac1b6f634965008f2b
Component: engine
2014-11-12 14:15:29 -08:00
f8e94225af
registry: always treat 127.0.0.1 as insecure for all cases anytime anywhere
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 11380a109e53bc5f388b6212c12794609c0241eb
Component: engine
2014-11-12 12:14:43 -08:00
dc8c6e365a
registry: default --insecure-registry to localhost and 127.0.0.1
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 28ee373e19bbfdf47c747f6fd9385a8a75f0a483
Component: engine
2014-11-12 09:12:42 -08:00
