7422e1b951
Merge pull request #19053 from anusha-ragunathan/vendor-policy
...
Create standard vendor policies.
Upstream-commit: 664ba0ec0a220d569df4c409a832d0508a93f6e6
Component: engine
2016-01-12 08:32:06 -08:00
e2b2a71502
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
3340505b84
Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port
...
Fix ambassador script
Upstream-commit: 3f1b16e236ad4626e02f3da4643023454d7dbb3f
Component: engine
2016-01-11 17:41:53 -08:00
e46c089f56
Merge pull request #18998 from calavera/syslog_tls
...
Allow syslog over TCP+TLS.
Upstream-commit: 656979670c5225753ad8d0c6d2bb1ab1a82b0b56
Component: engine
2016-01-11 17:21:38 -08:00
3b26d1d1d4
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
35f8dfbc72
List engine-api in the client libraries reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: bce01398dda39e551a39f287224189f70accaf80
Component: engine
2016-01-11 19:17:13 -05:00
ba487d20bc
Merge pull request #19247 from tiborvass/remove-tac
...
Make Makefile work on OS X
Upstream-commit: 058e6dce184fdfc12d7d93faeb669d5afa428518
Component: engine
2016-01-11 19:13:55 -05:00
622bd04e41
Merge pull request #19217 from justincormack/arm_syscalls
...
Add arm specific syscalls to default seccomp profile
Upstream-commit: a96a0b37818e26bea173aa718df92f50b21093c3
Component: engine
2016-01-11 15:26:09 -08:00
d54137b176
Make Makefile work on OS X
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: df40c61f8ae43349b7504509e8d004f86175c862
Component: engine
2016-01-11 18:16:56 -05:00
8e7c65a2dd
Merge pull request #19069 from jfrazelle/apparmor-regex-proc
...
fix proc regex
Upstream-commit: 9c9a1d1b4bc2122548a38b233a2f26ab5304de4c
Component: engine
2016-01-11 13:50:25 -08:00
46b5818462
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
Upstream-commit: f11b6a2ab313a03d051dd6f69d264d0482df72d6
Component: engine
2016-01-11 12:01:46 -08:00
e06b7c48a9
Merge pull request #19208 from sdurrheimer/zsh-completion-update_isolation_shm-size_memory_reservation
...
Zsh completion for 'docker update' + common options refactoring
Upstream-commit: 1a7d40c69221fe39d7be9976398ade678627b9d6
Component: engine
2016-01-11 11:36:55 -08:00
7db7ce5bef
Merge pull request #19239 from aaronlehmann/fix-testsuccessfuldownload
...
Fix flaky test TestSuccessfulDownload
Upstream-commit: 0cdfd84aeedda09914ec159e96497a502db9109e
Component: engine
2016-01-11 14:09:14 -05:00
bc47f91463
Merge pull request #16032 from cpuguy83/remove_sqlite_dep
...
Build names and links at runtime - no more sqlite
Upstream-commit: 9a23569ecf48e07b6c6e7c1d734b54c7ce4c666a
Component: engine
2016-01-11 10:59:49 -08:00
5cfea6b0eb
Merge pull request #19076 from tianon/multiarch
...
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
Upstream-commit: 2d5ca742eb54e077861a29f201eb8fa38359cb1b
Component: engine
2016-01-11 13:25:55 -05:00
2250226bc8
Fix flaky test TestSuccessfulDownload
...
One of the things this test checks is that the progress indicator
completes for each download. Some progress messages may be lost because
only one message is buffered for each download, but the last progress
message is guaranteed not to be lost. The test therefore checks for a
10/10 progress indication.
However, the assumption that this is the last progress message to be
sent is incorrect. The last message is actually "Pull complete". So
check for this instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0757a52737b283e56c9a8f5597e8b52c365ce1f6
Component: engine
2016-01-11 09:46:34 -08:00
1c0d76c749
Add support for syslog over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4b98193beab00bc6cf48762858570a1bd418c9ef
Component: engine
2016-01-11 12:25:34 -05:00
e70fdfac3a
Add migration from sqlite links back to hostConfig
...
Before #16032 , once links were setup
in the sqlite db, hostConfig.Links was cleared out.
This means that we need to migrate data back out of the sqlite db and
put it back into hostConfig.Links so that links specified on older
daemons can be used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2600777469b18f7133fc4d6c6c99698d6aa700fe
Component: engine
2016-01-11 11:31:29 -05:00
5ffd6c31d8
Merge pull request #19121 from WeiZhang555/tty-resize
...
Check nil Terminal to avoid panic
Upstream-commit: 47074030f6e34fc238ed503e8c8e5ae0ef526e27
Component: engine
2016-01-11 11:29:15 -05:00
15e94930a8
Merge pull request #19138 from Microsoft/jjh/failedtodockerversion
...
Windows CI: More debugging
Upstream-commit: ad2966a3159514620c2dc36d8e7fdcee948e8468
Component: engine
2016-01-10 18:11:19 -08:00
3a03e124c2
Merge pull request #19222 from justincormack/shirley
...
Add Dame Stephanie "Steve" Shirley to names
Upstream-commit: 3f74d10142051abc231093cc05b76b08ae30f597
Component: engine
2016-01-11 00:09:45 +01:00
ddd50b3705
Merge pull request #18512 from euank/18510-fixOomKilled
...
Set OOMKilled state on any OOM event
Upstream-commit: 967acd56c175b7c0f3ad4236c664730338a94bb8
Component: engine
2016-01-11 00:09:26 +01:00
61ef2466ac
Add Dame Stephanie "Steve" Shirley to names
...
Born in Germany, she had to flee on the kindertransport to England in
1939. In the 1950s she worked at the Post Office Research Station at
Dollis Hill, building computers from scratch, and took evening classes
to get a degree in Mathematics.
In 1962 she set up a software company, employing almost entirely women,
working at home; the company was floated in 1996. Her team's projects
included programming Concorde's black box flight recorder. She adopted
the name "Steve" to fit in in a male domainated world.
http://www.bbc.co.uk/programmes/b05pmvl8
https://en.wikipedia.org/wiki/Steve_Shirley
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com >
Upstream-commit: 4c530894f94069c14c872c4b2d0ebfb10c86466a
Component: engine
2016-01-10 21:33:18 +00:00
2324c52cfd
Merge pull request #19220 from anujbahuguna/master
...
Adding 2 pioneer CS reseachers-Shafi Goldwasser and Michael Stonebraker
Upstream-commit: fc4dffee5eca697df07263edf691151078d235c7
Component: engine
2016-01-10 22:28:59 +01:00
c1c124e078
Merge pull request #19193 from Microsoft/jjh/networkapitests
...
Windows CI: Turn off network API tests
Upstream-commit: 6175add0e16d275511162f521dafdda7ba8f560c
Component: engine
2016-01-10 21:18:21 +01:00
7e1d4c2453
Merge pull request #19195 from Microsoft/jjh/wincifailingtests
...
Windows CI: Deal with failing tests for TP4
Upstream-commit: 38f4217bfff1e5aec7457c2acfbe2409759ee830
Component: engine
2016-01-10 21:18:02 +01:00
1567cd421d
Add arm specific syscalls to default seccomp profile
...
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com >
Upstream-commit: 37d35f3c280dc27a00f2baa16431d807b24f8b92
Component: engine
2016-01-10 19:55:24 +00:00
26f279a5f0
Merge pull request #19205 from runcom/fix-formats
...
integration-cli: fix wrong formats
Upstream-commit: 7b1caafe27c06aae3311f00a9bdee021c3be8b63
Component: engine
2016-01-10 20:53:11 +01:00
7e3ab3dcd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
Upstream-commit: fe3d1f9dd7f2c888ad69034464cba6a35a56018f
Component: engine
2016-01-10 11:46:34 -08:00
550d4b865b
Adding two pioneer CS reseachers - Shafi Goldwasser and Michael Stonebraker
...
Signed-off-by: Anuj Bahuguna <anujbahuguna.dev@gmail.com >
Upstream-commit: cac23d1caa420ce3b2684d8d4fabcf3d7d5c9906
Component: engine
2016-01-11 00:25:46 +05:30
fd32c5b230
Add i386 specific modify_ldt syscall to default seccomp filter
...
This syscall is used by Go on i386 binaries, although not by libc.
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com >
Upstream-commit: 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b
Component: engine
2016-01-10 12:00:11 +00:00
b9cea74caa
Merge pull request #19171 from londoncalling/cloud-installs-redirects
...
added re-directs for cloud install docs as clean-up for #18282
Upstream-commit: 7058495ab8bd358e11e1b06eb90298a0a207d7c5
Component: engine
2016-01-09 17:43:41 -08:00
491c316b7d
bash completion for docker {build,create,run} --shm-size
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3f6b0f4c7c87f8f8f01e67ea3750015e9dcab9bf
Component: engine
2016-01-09 09:27:45 -08:00
3ebca99469
Add zsh completion for 'docker {build,create,run} --isolation'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d14eba774d4a5e51f1208a4aa5e9dad44966d5c9
Component: engine
2016-01-09 14:48:55 +01:00
6037d11431
Add zsh completion for 'docker {build,create,run} --shm-size
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 01e6bd3c3e79c77c35a443c5eea9a94fbb9861a3
Component: engine
2016-01-09 14:46:06 +01:00
5a1f73e461
Add zsh completion for 'docker {create,run,update} --memory-reservation'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 3a8fb8de4f10024cb4968c3e25c417080ac17576
Component: engine
2016-01-09 14:40:37 +01:00
524263a6b2
Add zsh completion for 'docker update' + refactoring of common options between 'build', 'create', 'run', 'update'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8a95f8827231164acc3971cab7c0d0325d6ef31d
Component: engine
2016-01-09 14:38:22 +01:00
a18ec5adb2
integration-cli: fix wrong formats
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5fe38d39e7c7085e53904d6403e8b48274f86e8b
Component: engine
2016-01-09 11:44:15 +01:00
a478ae86ba
Merge pull request #19167 from vieux/bring_discovery_on_par
...
Bring discovery on par with the one in docker/swarm
Upstream-commit: c49ccd319249610eb05f0c430b26d7c82383bf76
Component: engine
2016-01-08 22:54:01 -08:00
a6fdd5f023
Merge pull request #19202 from cyli/vendor-notary
...
Re-vendoring notary
Upstream-commit: 92b0005a1a31cf14f4836903d0688468b05f4530
Component: engine
2016-01-08 22:48:18 -08:00
f4d0dc32a0
Use RootFS from image config to register layers on Windows
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 7450c258abe01585f861f4a1b5d2b97539dbbdce
Component: engine
2016-01-08 17:27:31 -08:00
6fca8512b5
Add integration test for pulling a manifest list
...
The test injects a synthetic manifest list into the registry blob store,
since there isn't a tool for pushing them yet.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: ad6c1b76497c4b39953b5af28f83a21a2eb36bf7
Component: engine
2016-01-08 17:27:31 -08:00
4d0b394b25
Build a pre-schema2 registry to test schema1 push/pull
...
Add DockerSchema1RegistrySuite which uses this registry, and make
applicable integration tests run as part of this suite.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 1fa2e3115105f6b2334f452bd08415e8f00633d7
Component: engine
2016-01-08 17:27:31 -08:00
de6e714e78
Add support for manifest lists ("fat manifests")
...
A manifest list refers to platform-specific manifests. This allows
for images that target more than one architecture to share the same tag.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2bb8c85bc5e59d2f5a154b58bb9a4b6e86775a40
Component: engine
2016-01-08 17:27:31 -08:00
17eed595ac
Add schema2 push support
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c8d277d228fbb4ec168a5d459c6e874cf9a872b3
Component: engine
2016-01-08 17:27:31 -08:00
e149f9fc4c
Add schema2 pull support
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 94726f7c7391d990d3d15f88ea20dbe8fe23c958
Component: engine
2016-01-08 17:24:21 -08:00
c8cdbc5c42
Change push to use manifest builder
...
Currently this always uses the schema1 manifest builder. Later, it will
be changed to attempt schema2 first, and fall back when necessary.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f33fa1b8d3befec31fdf1952ea1190012c812dc7
Component: engine
2016-01-08 17:24:21 -08:00
fbe586aef3
Update code to compile against new manifest interface
...
Also, digest.FromBytes no longer returns an error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c168a0059f56507731e59c0264d96b5a74f93507
Component: engine
2016-01-08 17:24:20 -08:00
75cd536d3d
Vendor updated github.com/docker/distribution
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 290ba41c00488b8c4ac2e5488bc1b040b758df75
Component: engine
2016-01-08 17:24:20 -08:00
5dc0139c60
Merge pull request #18840 from aaronlehmann/trust-messages
...
Send push information to trust code out-of-band
Upstream-commit: 2892de760f412360c5effef9cfc346f2d92eaa4c
Component: engine
2016-01-08 16:56:57 -08:00
