David Calavera
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
Brian Goff
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
Tibor Vass
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
Arnaud Porterie
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Justin Cormack
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
Vincent Demeester
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Justin Cormack
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
Vincent Demeester
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
Arnaud Porterie
7e3ab3dcd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
Upstream-commit: fe3d1f9dd7f2c888ad69034464cba6a35a56018f
Component: engine
2016-01-10 11:46:34 -08:00
Anuj
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
Jess Frazelle
e25e21a6d3
Merge pull request #19218 from justincormack/i386_syscalls
...
Add i386 specific modify_ldt syscall to default seccomp filter
Upstream-commit: 274558881ae5d2fcf3a3d72c31d4fde9e415dcbc
Component: engine
2016-01-10 09:34:56 -08:00
Justin Cormack
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
moxiegirl
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
Tianon Gravi
675c847472
Merge pull request #19210 from albers/completion--shm-size
...
bash completion for `docker {build,create,run} --shm-size`
Upstream-commit: 2a868799bfe48afcb2111a060684cab062054cf6
Component: engine
2016-01-09 11:05:39 -08:00
Harald Albers
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Antonio Murdaca
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
Tõnis Tiigi
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
Tõnis Tiigi
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Michael Crosby
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
cyli
03dfb7ff42
Re-vendoring notary in order to deal with a canonical JSON serialization issue.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
2016-01-08 16:45:15 -08:00
Michael Crosby
8334f715ad
Merge pull request #19199 from crosbymichael/migrate-errors
...
Fixed migrate defect, allow migrate the empty directory
Upstream-commit: 0a002f4ba813305a16f4ffb21488865601f0f18e
Component: engine
2016-01-08 16:37:57 -08:00
andy
8912ced795
Fixed migrate defect, allow migrate the empty directory
...
If there is an empty directory exists in the $DOCKER_ROOT/containers ,
that will cause migrate fail. Then docker daemon will initialize failed.
This commit allow skips the empty directory.
Signed-off-by: Andy Zhang <andy.zhangtao@hotmail.com >
Change error messages from uppercase to lowercase
Change error messages from uppercase to lowercase
Signed-off-by: andy <ztao@tibco-support.com >
Upstream-commit: 098fdb6408e4e630c1c78b8283c4bc716cc46698
Component: engine
2016-01-08 15:44:30 -08:00
Sebastiaan van Stijn
7eedab5098
Merge pull request #18736 from WeiZhang555/tiny-lock
...
Break big lock into some tiny locks for containerStart
Upstream-commit: a082f8083212a50b5a3e40e2d2507b78e0a8e6a8
Component: engine
2016-01-09 00:35:26 +01:00
Euan
74e4071165
Increase integration cli test memory
...
Signed-off-by: Euan <euank@amazon.com >
Upstream-commit: ba19b6927fd79be4d676ff228128d72393cbf76a
Component: engine
2016-01-08 23:10:31 +00:00
Santhosh Manohar
d8dc8b7d33
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
2016-01-08 14:13:55 -08:00
Santhosh Manohar
d53ca527b3
Vendoring libnetwork and its dependencies..
...
- replace /etc/hosts based name resolution with embedded DNS for user
defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 8ccf5cffa7cd3cfd8e83fdaebc60a9f3d2473bcc
Component: engine
2016-01-08 14:13:21 -08:00
Alexander Morozov
12ab071eb0
Merge pull request #19135 from Microsoft/jjh/securitywarning
...
Windows: Fix security warning regression
Upstream-commit: 807d575b5ef1785ded1038dca2cfbf2afa2d5a0c
Component: engine
2016-01-08 13:55:41 -08:00
John Howard
8157f678e4
Windows CI: Deal with failing tests for TP4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 25c383391a951e5bc9cb2f003ce69f119779fb2c
Component: engine
2016-01-08 13:49:43 -08:00
Tianon Gravi
b4fe367544
Merge pull request #19181 from coolljt0725/enable_build_syscall_test
...
Make .ensure-syscall-test to use build-arg
Upstream-commit: 335764a5913900283a489ef771013041ffba7230
Component: engine
2016-01-08 13:43:38 -08:00
John Howard
f999a9492a
Windows CI: Turn off network API tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4c380010a6c001cda7cbe7184eb298ec885774ce
Component: engine
2016-01-08 12:58:54 -08:00
Aidan Hobson Sayers
7ad15b069e
Fix ambassador script based on SvenDowideit/dockerfiles#37
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: cc44ea21e481d34ab9621afd6944b6c14a23106a
Component: engine
2016-01-08 20:55:22 +00:00
Jess Frazelle
d3832b1ec4
Merge pull request #19186 from unclejack/no_mail_maintainers
...
CONTRIBUTING: add guidelines regarding email
Upstream-commit: 719526d87c17eb65cde9a95048252dd468df99f1
Component: engine
2016-01-08 12:51:59 -08:00
Phil Estes
898ac34e33
Move userns support out of experimental into master
...
Adds the `--userns-remap` flag to the master build
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 557c7cb888ad8e2f1f378c9cf34e5fba14551904
Component: engine
2016-01-08 15:06:22 -05:00