Commit Graph

13910 Commits

Author SHA1 Message Date
919e9683e3 Enable v2 default push
When pushing to the official registry, v2 push will be attempted first. If the v2 endpoint is unavailable, a push to v1 will occur. If a v2 push is started and failed, the push operation will fail. Pulling non-official images the official v2 registry is also enabled to pull the newly push images. When a pull of a v2 image fails, v1 will always be attempted.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 770e9b6b819b495a933b2f467bf768a1b785d5ad
Component: engine
2015-03-20 11:09:33 -07:00
86ac9e315e Merge pull request #11475 from estesp/registry-is-distribution
We should point README readers at the new registry v2 project
Upstream-commit: 79744811623cc794d028abfc70ac3f58db9f4b9b
Component: engine
2015-03-20 13:59:25 -04:00
412e4a6c17 Merge pull request #11521 from duglin/AddLABELCacher
Add LABEL config check to runconfig compare
Upstream-commit: df8110519a3c40f7b5b98f977942973e4ccdc2e0
Component: engine
2015-03-20 13:52:13 -04:00
f11a0af1f0 Merge pull request #11457 from jlhawn/pull_by_digest_verify
Add verification of image manifest digests on v2 push/pull
Upstream-commit: 24a148d384b6b0c308679962352d6bc8a8ef5795
Component: engine
2015-03-20 10:49:16 -07:00
b8ae174fd2 Merge pull request #11408 from Mashimiao/fix-wrong-tab-completion
fix wrong tab completion
Upstream-commit: ba6de9121f970f8e2576e4fa9486d3abf9c5811c
Component: engine
2015-03-20 10:46:26 -07:00
121581abda Merge pull request #11522 from duglin/FixCGroupTests
Ignore blank lines in getCgroupPaths
Upstream-commit: 0dca963f403d7b0fd700da2076420ea72e05866f
Component: engine
2015-03-20 10:44:57 -07:00
54c09d3930 Add verification of image manifest digests
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 9ececa14ba860c9934d3cd8d3e704e53e828e22b
Component: engine
2015-03-20 09:34:39 -07:00
50fc694c96 Merge pull request #11481 from jfrazelle/perms-on-release
cleanup docs/release.sh
Upstream-commit: d2cb3af75b5c8597be5cddfe15f1002f482870cf
Component: engine
2015-03-20 10:57:43 -04:00
1198ecb944 Add LABEL config check to runconfig compare
Without this we won't do a proper cacche check because we skip the
labels part of the config.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b4beb0637a61c6002bb3b0b1dc150899db3b44e4
Component: engine
2015-03-20 05:55:48 -07:00
63456fafcf Ignore blank lines in getCgroupPaths
w/o this I would see:
```
  unexpected file format for /proc/self/cgroup - ""
```
while running the cgroup tests

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 301bd57b1d5ce78fe3e26f68c8f8f797abfbb5ca
Component: engine
2015-03-20 05:36:34 -07:00
f785f7c627 Merge pull request #11512 from vishh/parent-cgroup
Update --cgroup-parent cli integration test to use "memory" cgroup instead of "cpu"
Upstream-commit: 385d4beaa5060667f7b2ec51b16fef3f4830271c
Component: engine
2015-03-19 21:28:59 -07:00
b6cc2868a6 change perms on release and cleanup docs
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

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

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

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 844c0f154abff1fc6e9e3907b23d1f3d99b0e840
Component: engine
2015-03-19 21:07:02 -07:00
6a2a2b2e20 Merge pull request #11501 from duglin/TestLabels
Add a LABEL cache check testcase
Upstream-commit: 051bdf5c55dcc9bbf6cd2a4b4babb432cdf8eb56
Component: engine
2015-03-19 23:01:29 -04:00
bab50b4201 Add a LABEL cache check testcase
Thanks to @tiborvass's review of another PR it was noticed that
we didn't have a testcase to make sure the cache checking for LABEL
was being done properly.  This adds a test for it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 97c573bf020e946fe1b9af61269f7f13f7f63f67
Component: engine
2015-03-19 19:18:00 -07:00
863c40a009 Update --cgroup-parent cli integration test to use "memory" cgroup for detecting the test's
cgroups path instead of CPU.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 49cb1a289f19565132824e67bb83a2e255b13c8a
Component: engine
2015-03-20 00:38:19 +00:00
059dac075a Merge pull request #11456 from tianon/explicit-curl-missing-failure
Fail explicitly if curl is missing in contrib/download-frozen-image.sh
Upstream-commit: 56f483072d8bcba629ed8dd69e2a4eac334fb5c6
Component: engine
2015-03-19 16:23:07 -07:00
5e34656977 Merge pull request #11470 from albers/events-filter-name
Remove 'name' filter from docker events documentation
Upstream-commit: f574262ff74126f080a7e9bd16f0e4017761de94
Component: engine
2015-03-19 16:22:30 -07:00
2c047d4fdf Merge pull request #11479 from falmp/patch-1
Fixed --read-only description indentation
Upstream-commit: 0d3da36a5f4362a0e5907d3d0a69ac66ded6b04f
Component: engine
2015-03-19 16:22:08 -07:00
586d8f70ba Merge pull request #11498 from jbnunn/patch-1
Typo/grammar corrections to dockerizing.md
Upstream-commit: fcc87c0df0c3d5da72786db2df9dc6b4ed090a08
Component: engine
2015-03-19 16:21:29 -07:00
20a75ab782 Merge pull request #11494 from sunyuan3/m2
add TestContainerRestartwithGoodContainer test case
Upstream-commit: 5d90a8cc8382b5828eb8f7206a5f3480bd277e5a
Component: engine
2015-03-19 16:16:38 -07:00
4137db45c7 Merge pull request #11507 from crosbymichael/container-state
Cleanup libcontainer container state
Upstream-commit: 5a239c0022212d657313bc8d15af3b835dedbda1
Component: engine
2015-03-19 16:02:24 -07:00
fd07d86cdd Merge pull request #11124 from tianon/autoremove-recommends
Set "Apt::AutoRemove::RecommendsImportant" to "false" in debootstrap
Upstream-commit: 9e5c0641e9046c1ed1f1d50c6ebfd93195bf4291
Component: engine
2015-03-19 16:00:40 -07:00
a5bb86caaa Merge pull request #11428 from vishh/parent-cgroup
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
2015-03-19 14:41:57 -07:00
ec306144db Mount libcontainer state dir in tmpfs
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2b12b099b8c60f02142ab8ece68987a8fba00292
Component: engine
2015-03-19 14:27:17 -07:00
cb0e64d97b Ensure the container state is removed on daemon boot
This ensures that the libcontainer state is fully removed for a
container after it is terminated.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 06c939e5279eb62b9088202a27d02d67c1cba6a5
Component: engine
2015-03-19 14:21:19 -07:00
022bfbf5f3 Merge pull request #11477 from dmcgowan/fix-auth-http-client
Update auth client configuration to use proper tls config
Upstream-commit: 661c31737dde7770d6f9bd5125ce85751887c3b7
Component: engine
2015-03-19 14:17:47 -07:00
095f769c9d Merge pull request #11502 from mrunalp/update_libcontainer
Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
Upstream-commit: 65f0ba42f5fa260d2b3b35fa22087f202058f29d
Component: engine
2015-03-19 14:15:35 -07:00
67dd189d62 Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 60ef4ae6fcb015546a646eb3b613344a9c4fc27b
Component: engine
2015-03-19 14:42:23 -04:00
4f16948c8d Merge pull request #11493 from proppy/patch-13
CONTRIBUTING.md: fix markdown formating
Upstream-commit: 831c796fb7cdf7f9bd429d65b6e420405e2cae83
Component: engine
2015-03-19 09:15:16 -07:00
627077c4f9 Typo/grammar corrections to dockerizing.md
Added commas where necessary, edited typos to improve readability.

Signed-off-by: J. Nunn <jeffnunn@amazon.com>
Upstream-commit: a8faba021c569a53f03ed68b27d2f53db2d70f3d
Component: engine
2015-03-19 10:51:12 -05:00
22d9cf2b19 Merge pull request #11459 from simonswine/10001-ipv6-tests
[WiP] Adds testing for bridge's IPv6 support
Upstream-commit: d338c613bf7c9dc7e77bebf104ba83f69aaeb8a7
Component: engine
2015-03-19 08:37:28 -07:00
7b57ca682e We should point README readers at the new registry v2 project
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: b4ebcdef155d2c517192a07ddfa80e163d78b1b1
Component: engine
2015-03-19 11:11:51 -04:00
a94170b2cb Fixed --read-only description indentation
The wrong indentation was breaking documentation layout with code blocks.

Signed-off-by: Francisco Lopes <chico.lopes@gmail.com>
Upstream-commit: b311066d240e6f034c8a5749f01897739f26c7bb
Component: engine
2015-03-19 11:53:50 -03:00
2bcbb3285b Merge pull request #11274 from MabinGo/selinux_enable_verify
Add logs when Docker enabled selinux (closes #11197)
Upstream-commit: fdf49d758f6f93d04077ad0c82a7fd7312b2ffdc
Component: engine
2015-03-19 10:34:55 -04:00
1d92cf5680 Merge pull request #11453 from duglin/HideDaemonDots
Hide dots on daemon startup when loglevel != info
Upstream-commit: 9d5eab18737adc82e3191c7708e5df540d0b485e
Component: engine
2015-03-19 10:10:18 -04:00
5e77b6e481 Merge pull request #11455 from tianon/minor-formatting-consistency
Fix several very minor consistency issues
Upstream-commit: ae1d3d6d6851c2721bae94f0c7c0c0af9b866392
Component: engine
2015-03-19 09:57:57 -04:00
6061dc16e1 Merge pull request #11496 from docker/revert-11495-m3
Revert "correct comment errors for netlink_linux.go"
Upstream-commit: 27fd77cc3be15208071029e4659f67163a44574e
Component: engine
2015-03-19 09:38:25 -04:00
eec8373c1c Revert "correct comment errors for netlink_linux.go"
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: d173669fdff8ec1acc33d2da28e2a473a3844e56
Component: engine
2015-03-19 14:38:00 +02:00
0b3e883c9e Merge pull request #11495 from sunyuan3/m3
correct comment errors for netlink_linux.go
Upstream-commit: 70092e5ebbb0afe9ce6b125643265541298309fe
Component: engine
2015-03-19 08:29:54 -04:00
d2b7fa6417 correct comment errors for netlink_linux.go
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: c5fdc93f89db3cb3ea4489999296487fad0f440d
Component: engine
2015-03-19 20:29:30 +08:00
aa7fb83cec add TestContainerRestartwithGoodContainer test case
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: 133983190622bf2618df6c36fb77669e30458e17
Component: engine
2015-03-19 20:20:04 +08:00
35418ac64f CONTRIBUTING.md: fix markdown formating
Signed-off-by: Johan Euphrosine <proppy@google.com>
Upstream-commit: 1d9fb2583cd85261f0813edcf5d3ddf89fefc397
Component: engine
2015-03-19 01:51:45 -07:00
07ba863c0f Remove 'name' filter from docker events documentation
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ec7530afde3f45a31d51abe17f602a3c5dc6389e
Component: engine
2015-03-19 08:51:36 +01:00
27ea0d1653 Merge pull request #11488 from stevvooe/address-digest-deadlock
Correctly close pipe after error in tarsum verification
Upstream-commit: c861231a70342472ad9322320bf6fb62e6afba35
Component: engine
2015-03-18 23:00:13 -07:00
a7ed4dc483 Merge pull request #11028 from jstangroome/patch-1
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
2015-03-19 01:44:43 -04:00
b21852214d Adding integration tests for --cgroup-parent feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
2015-03-19 02:34:42 +00:00
8bcedc4b44 Adding documentation for '--cgroup-parent' option.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: f7dd1333b5a6dfa34ce8b2fb15533f1aca6efdc3
Component: engine
2015-03-19 02:34:15 +00:00
1f50057df8 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 0b1e2b5a553565e99afd7ceda36beab098f506d0
Component: engine
2015-03-19 02:34:15 +00:00
b16d50a307 Correctly close pipe after error in tarsum verification
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.

A test to ensure validation errors for unsupported digest types has been added,
as well.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0306a41909175b467d08ebc97d4c5136ca9e7ebd
Component: engine
2015-03-18 19:07:55 -07:00
ccb5c44c68 Add logs when Docker enabled selinux
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 1bf529a45674dc07de6efba806b854f63f3dc0bf
Component: engine
2015-03-19 09:46:53 +08:00