David Calavera
0627bf1a83
Do not force network disconnection.
...
Let that for a future flag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:17 -05:00
David Calavera
ca60e6262b
Vendor engine-api 0.2.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:16 -05:00
Sebastiaan van Stijn
1393c450cd
Merge pull request #19104 from vdemeester/18957-update-config
...
Add a specific config struct for the update command (#18957 )
2016-01-12 09:46:19 -08:00
Sebastiaan van Stijn
c72be040bb
Merge pull request #19187 from estesp/lets-do-this
...
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
Arnaud Porterie
664ba0ec0a
Merge pull request #19053 from anusha-ragunathan/vendor-policy
...
Create standard vendor policies.
2016-01-12 08:32:06 -08:00
Sebastiaan van Stijn
301627c677
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
2016-01-12 07:06:31 -08:00
Vincent Demeester
a4f6920731
Add a specific config for the update command
...
This allows to define clearly what is mutable or not in a container
and remove the use of the internal HostConfig struct to be used.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-12 08:33:41 +01:00
Phil Estes
cc63db4fd1
Add daemon documentation on user namespaces feature
...
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-11 20:54:57 -05:00
Phil Estes
d5743a3a5c
Properly report conflicting namespace options when using userns
...
This prevents strange errors and clarifies which namespace options are
incompatible with user namespaces (at this time).
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-11 20:50:22 -05:00
Sebastiaan van Stijn
3f1b16e236
Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port
...
Fix ambassador script
2016-01-11 17:41:53 -08:00
Sebastiaan van Stijn
656979670c
Merge pull request #18998 from calavera/syslog_tls
...
Allow syslog over TCP+TLS.
2016-01-11 17:21:38 -08:00
Lei Jitang
79d4f0f56e
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-11 20:13:39 -05:00
Jess Frazelle
acff8f7a9d
Merge pull request #19248 from calavera/list_engine_api
...
List engine-api in the client libraries reference.
2016-01-11 16:40:12 -08:00
David Calavera
bce01398dd
List engine-api in the client libraries reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-11 19:17:13 -05:00
Tibor Vass
058e6dce18
Merge pull request #19247 from tiborvass/remove-tac
...
Make Makefile work on OS X
2016-01-11 19:13:55 -05:00
Jess Frazelle
a96a0b3781
Merge pull request #19217 from justincormack/arm_syscalls
...
Add arm specific syscalls to default seccomp profile
2016-01-11 15:26:09 -08:00
Tibor Vass
df40c61f8a
Make Makefile work on OS X
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-11 18:16:56 -05:00
Jess Frazelle
9c9a1d1b4b
Merge pull request #19069 from jfrazelle/apparmor-regex-proc
...
fix proc regex
2016-01-11 13:50:25 -08:00
Arnaud Porterie
f11b6a2ab3
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
2016-01-11 12:01:46 -08:00
David Calavera
1a7d40c692
Merge pull request #19208 from sdurrheimer/zsh-completion-update_isolation_shm-size_memory_reservation
...
Zsh completion for 'docker update' + common options refactoring
2016-01-11 11:36:55 -08:00
Brian Goff
0cdfd84aee
Merge pull request #19239 from aaronlehmann/fix-testsuccessfuldownload
...
Fix flaky test TestSuccessfulDownload
2016-01-11 14:09:14 -05:00
Alexander Morozov
9a23569ecf
Merge pull request #16032 from cpuguy83/remove_sqlite_dep
...
Build names and links at runtime - no more sqlite
2016-01-11 10:59:49 -08:00
Tibor Vass
2d5ca742eb
Merge pull request #19076 from tianon/multiarch
...
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
2016-01-11 13:25:55 -05:00
Aaron Lehmann
0757a52737
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>
2016-01-11 09:46:34 -08:00
David Calavera
4b98193bea
Add support for syslog over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-11 12:25:34 -05:00
Brian Goff
2600777469
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>
2016-01-11 11:31:29 -05:00
Tibor Vass
47074030f6
Merge pull request #19121 from WeiZhang555/tty-resize
...
Check nil Terminal to avoid panic
2016-01-11 11:29:15 -05:00
Arnaud Porterie
ad2966a315
Merge pull request #19138 from Microsoft/jjh/failedtodockerversion
...
Windows CI: More debugging
2016-01-10 18:11:19 -08:00
Sebastiaan van Stijn
3f74d10142
Merge pull request #19222 from justincormack/shirley
...
Add Dame Stephanie "Steve" Shirley to names
2016-01-11 00:09:45 +01:00
Sebastiaan van Stijn
967acd56c1
Merge pull request #18512 from euank/18510-fixOomKilled
...
Set OOMKilled state on any OOM event
2016-01-11 00:09:26 +01:00
Justin Cormack
4c530894f9
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>
2016-01-10 21:33:18 +00:00
Vincent Demeester
fc4dffee5e
Merge pull request #19220 from anujbahuguna/master
...
Adding 2 pioneer CS reseachers-Shafi Goldwasser and Michael Stonebraker
2016-01-10 22:28:59 +01:00
Vincent Demeester
6175add0e1
Merge pull request #19193 from Microsoft/jjh/networkapitests
...
Windows CI: Turn off network API tests
2016-01-10 21:18:21 +01:00
Sebastiaan van Stijn
38f4217bff
Merge pull request #19195 from Microsoft/jjh/wincifailingtests
...
Windows CI: Deal with failing tests for TP4
2016-01-10 21:18:02 +01:00
Justin Cormack
37d35f3c28
Add arm specific syscalls to default seccomp profile
...
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-10 19:55:24 +00:00
Vincent Demeester
7b1caafe27
Merge pull request #19205 from runcom/fix-formats
...
integration-cli: fix wrong formats
2016-01-10 20:53:11 +01:00
Arnaud Porterie
fe3d1f9dd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
2016-01-10 11:46:34 -08:00
Anuj
cac23d1caa
Adding two pioneer CS reseachers - Shafi Goldwasser and Michael Stonebraker
...
Signed-off-by: Anuj Bahuguna <anujbahuguna.dev@gmail.com>
2016-01-11 00:25:46 +05:30
Jess Frazelle
274558881a
Merge pull request #19218 from justincormack/i386_syscalls
...
Add i386 specific modify_ldt syscall to default seccomp filter
2016-01-10 09:34:56 -08:00
Justin Cormack
13a9d4e899
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>
2016-01-10 12:00:11 +00:00
moxiegirl
7058495ab8
Merge pull request #19171 from londoncalling/cloud-installs-redirects
...
added re-directs for cloud install docs as clean-up for #18282
2016-01-09 17:43:41 -08:00
Tianon Gravi
2a868799bf
Merge pull request #19210 from albers/completion--shm-size
...
bash completion for `docker {build,create,run} --shm-size`
2016-01-09 11:05:39 -08:00
Harald Albers
3f6b0f4c7c
bash completion for docker {build,create,run} --shm-size
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-09 09:27:45 -08:00
Steve Durrheimer
d14eba774d
Add zsh completion for 'docker {build,create,run} --isolation'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:48:55 +01:00
Steve Durrheimer
01e6bd3c3e
Add zsh completion for 'docker {build,create,run} --shm-size
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:46:06 +01:00
Steve Durrheimer
3a8fb8de4f
Add zsh completion for 'docker {create,run,update} --memory-reservation'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:40:37 +01:00
Steve Durrheimer
8a95f88272
Add zsh completion for 'docker update' + refactoring of common options between 'build', 'create', 'run', 'update'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:38:22 +01:00
Antonio Murdaca
5fe38d39e7
integration-cli: fix wrong formats
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-09 11:44:15 +01:00
Tõnis Tiigi
c49ccd3192
Merge pull request #19167 from vieux/bring_discovery_on_par
...
Bring discovery on par with the one in docker/swarm
2016-01-08 22:54:01 -08:00
Tõnis Tiigi
92b0005a1a
Merge pull request #19202 from cyli/vendor-notary
...
Re-vendoring notary
2016-01-08 22:48:18 -08:00