docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Calavera
c84f5dfd74 Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup 
Fix docker status incorrectly reports containerized
 2015-11-30 11:47:16 -08:00
Phil Estes
2a354790a6 Merge pull request #18241 from LK4D4/remove_listenbuffer 
Remove listenbuffer
 2015-11-30 14:37:14 -05:00
Jess Frazelle
e852959fad Merge pull request #18178 from jfrazelle/apparmor-we-meet-again 
Fix docker-default profile handing signals
 2015-11-30 11:34:34 -08:00
David Calavera
54733abba3 Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test 
Checkers on integration-cli/docker_api_info_test
 2015-11-30 11:06:15 -08:00
Alexandre Beslic
0f0cf267e8 Merge pull request #18204 from mavenugo/dhb 
Configurable discovery ttl and heartbeat timer
 2015-11-30 11:00:53 -08:00
Ying Li
a94a47651f Adds specific memory backend support to server and signer. 
The server already supported a memory backend, but now it must be
specified, rather than just being a fallback if no storage is
specified.  This also adds a signer backend to signer, which
previously required a MySQL backend.

Thanks @endophage for the excellent suggestion!

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-30 10:58:57 -08:00
Ying Li
f1bd28caf4 The TLS certificates are now relative to the config file used. 
Previously, if a relative path was provided, it was relative to the
current working directory to wherever the binaries were run.  Now
it is relative to whatever config file was used.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-30 10:58:57 -08:00
Ying Li
c43776d36f Use shared configuration parsing tools in notary-server. 
This changes the 'addr' parameter of notary-server's config to
'http_addr', so we can add a GRPC server to notary-server if
necessary.  This also allows environment variables to override
the notary-server config file entries, as notary-signer already
does.

The bugsnag configuration has also been changed so that the
bugsnag parameters are under the "bugsnag" key.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-30 10:58:57 -08:00
Ying Li
9e5ac006ec Use the shared configuration parsing code in notary-signer's parsing. 
Also add bugsnag support to notary-signer.

This also changes the 'server.cert_file' and 'server.key_file'
parameters to 'server.tls_cert_file' and 'server.tls_key_file',
respectively, to match notary-server.

Previously, the default alias, which was under the environment
variable NOTARY_SERVER_DEFAULT_ALIAS is now also available in
the config file in storage.default_alias.  The password has
not changed.

Finally, this removes some of the HSM references in notary-signer.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-30 10:58:57 -08:00
Ying Li
b25f8546f8 Ensure that environment variables can override config file entries. 
Also support parameterized allowed backends when parsing for
storage backends, so that a DB backend can be tested.

Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-30 10:58:57 -08:00
Ying Li
b1fdea5b56 Add shared config file parsing to the utils package. 
Signed-off-by: Ying Li <ying.li@docker.com>
 2015-11-30 10:58:57 -08:00
David Lawrence
c4636411bc Merge pull request #309 from docker/rename-keystoremanager 
Renamed keystoremanager to certs, and KeyStoreManager to Manager.
 2015-11-30 10:56:13 -08:00
David Lawrence
69dae91788 Merge pull request #314 from docker/mysql-user 
Just connect to mysql as root, rather than as dockerdemo user.
 2015-11-30 10:55:54 -08:00
Richard Scothern
261ed7fa98 Merge pull request #1213 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-11-30 10:22:44 -08:00
Jessica Frazelle
f8db9a09e0 check version for docker-default aa profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-30 10:18:12 -08:00
David Calavera
221d979e7b Merge pull request #18296 from jfrazelle/add-james 
add james golick to names generator
 2015-11-30 10:00:21 -08:00
Jess Frazelle
360a106511 Merge pull request #18303 from runcom/lxc-leftover 
daemon: remove sysInitPath, lxc leftover
 2015-11-30 09:37:05 -08:00
David Gageot
643b7349f7 Remove duplicated FakeApi 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-30 18:30:00 +01:00
Alexander Morozov
377e1d75f9 Merge pull request #18239 from jfrazelle/17783-fix-regex 
Fix parsing of apparmor pcre syntax
 2015-11-30 09:15:25 -08:00
Alexander Morozov
a0251b2bbf Remove listenbuffer package 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-30 09:04:59 -08:00
Alexander Morozov
ca5795cef8 Remove usage of listenbuffer package 
It actually adds nothing to queuing requests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-30 09:04:55 -08:00
David Gageot
f00b0b83cf Merge pull request #2458 from jeanlaurent/typo 
Typo in EC2 Driver
 2015-11-30 17:37:30 +01:00
Jean-Laurent de Morlhon
6d5bc99387 Typo 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-30 17:23:11 +01:00
Vincent Demeester
7bef428110 Merge pull request #18306 from runcom/add-test-suffix 
integration-cli: add _test suffix to test file
 2015-11-30 17:02:15 +01:00
Vincent Batts
a26accfb5d Merge pull request #18226 from duglin/Issue18170 
Fix for zero-sized layers
 2015-11-30 09:57:37 -06:00
David Gageot
47df63e932 Merge pull request #2454 from dgageot/google 
Improve Google Driver
 2015-11-30 16:04:47 +01:00
Phil Estes
f3ff09f578 Merge pull request #18272 from hqhq/hq_fix_kernel_memory 
Fix kernel memory limit
 2015-11-30 10:01:45 -05:00
Shijiang Wei
3f6182c384 fix the panic when "ps -a" with dead containers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-11-30 22:16:43 +08:00
David Gageot
ec76843e03 Cosmetics 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-30 14:24:58 +01:00
David Gageot
fea0dcb3da Simpler error message 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-30 14:24:58 +01:00
David Gageot
77b7734404 Simplify code 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-30 14:24:58 +01:00
David Gageot
085fe1334a Faster google driver 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-30 14:24:57 +01:00
Antonio Murdaca
f187bdbb9b Merge pull request #18302 from WeiZhang555/lint-auto 
Golint auto-generated file
 2015-11-30 12:32:23 +01:00
Antonio Murdaca
1f0f41e8d7 integration-cli: add _test suffix to test file 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-30 11:33:57 +01:00
Antonio Murdaca
d3af7f283d Add OomScoreAdj to configure container oom killer preferences 
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-30 11:19:04 +01:00
Sebastiaan van Stijn
634789baa2 Merge pull request #32 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-11-30 10:35:20 +01:00
Antonio Murdaca
1b726b29b2 daemon: remove sysInitPath, lxc leftover 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-30 10:04:13 +01:00
Jean-Laurent de Morlhon
48554182f1 Merge pull request #2427 from newpcraft/debugmsg_in_daemonresponding 
add debug message in dockerDaemonResponding function due to helping f…
 2015-11-30 09:56:29 +01:00
Jean-Laurent de Morlhon
2f92045679 Merge pull request #2452 from dgageot/2444-fix-scp 
FIX 2444 Command scp being called twice
 2015-11-30 09:36:55 +01:00
Zhang Wei
a7b73e57bc Golint auto-generated file 
Fix auto-generation script to golint auto-generated files.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-30 16:34:07 +08:00
Jean-Laurent de Morlhon
72044d6018 Merge pull request #2447 from yadutaf/master 
Reference OVH Cloud driver
 2015-11-30 09:19:57 +01:00
Sven Dowideit
8a4dea8916 Fix up some links to moved files 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-30 15:28:16 +10:00
Sven Dowideit
1c52d8fe6f Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-30 11:03:46 +10:00
Qiang Huang
0a426c47c8 Update cgroup integration tests 
Cgroup integtaion tests should cover:
- docker can run sucessfully with these options
- these cgroup options are set to HostConfig as expected
- these cgroup options are really set to cgroup files as expected
- other cases (wrong value, combinations etc..)

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-11-30 08:40:47 +08:00
Jessica Frazelle
bf66deeb08 add james golick to names generator 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-29 10:40:12 -08:00
Alexandre Beslic
d05c80c1ae Merge pull request #1459 from sandric/patch-1 
Update networking.md
 2015-11-29 01:25:50 -08:00
Jean-Tiare Le Bigot
c4b74f57ab Reference OVH Cloud driver 
Signed-off-by: Jean-Tiare Le Bigot <jean-tiare.le-bigot@ovh.net>
 2015-11-28 13:21:30 +01:00
Sebastiaan van Stijn
dd25d2c3db Merge pull request #18281 from runcom/18199-followup 
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
 2015-11-28 13:03:09 +01:00
David Gageot
faaac3df8c FIX 2444 Command scp being called twice 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-28 11:59:43 +01:00
sandric
f7e02d64ae Update networking.md 
Fix typos

Signed-off-by: sandric <kyrychenkoanton@gmail.com>
 2015-11-28 07:48:29 +02:00