Phil Estes
ae8c004dc1
Correct build-time directory creation with user namespaced daemon
...
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.
Add tests for the mkdir variants in pkg/idtools
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-10-20 08:59:48 -04:00
David Gageot
9c8b4e0da3
FIX #1974 in-container make test fails
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-20 14:56:07 +02:00
liaoqingwei
288214e5ae
Use of checkers on docker_cli_import_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
2015-10-20 19:58:16 +08:00
Brian Goff
89bfbb1516
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
2015-10-20 07:21:28 -04:00
Mohammed Aaqib Ansari
bc478b453f
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
2015-10-20 07:04:55 -04:00
Chanwit Kaewkasi
e64c5ee209
Merge pull request #1309 from vieux/improve_networks
...
small improvment on network UX
2015-10-20 17:12:38 +07:00
mnowster
5ed9f9bdf7
Merge pull request #2206 from dnephin/fix_extends_from_second_file
...
extends must be copied from override file
2015-10-20 10:22:58 +01:00
Hu Keping
969f1d9773
Docs: update docs for API stats
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-10-20 16:31:20 +08:00
David Gageot
4a33fabe8b
Check that VT-X/AMD-v is enabled
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-20 09:56:43 +02:00
liaoqingwei
37b3cd421f
Use of checkers on docker_cli_info_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
2015-10-20 13:38:55 +08:00
Jana Radhakrishnan
8adfc7e2d2
Fix docker startup failure due to dangling endpoints
...
Fixes docker startup failure due to dangling endpoints
which makes docker to not come up.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-19 21:29:35 -07:00
Jana Radhakrishnan
9750dd0088
Vendoring libnetwork
...
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052
Has bug fixes for 1.9
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-19 21:29:26 -07:00
Sven Dowideit
b826215c57
Merge pull request #16801 from aidanhs/aphs-add-socat-t
...
Update ambassador image, use the socat -t option
2015-10-20 14:24:25 +10:00
Sebastiaan van Stijn
310725c933
Merge pull request #17094 from GabrielNicolasAvellaneda/docs-fixes
...
MINOR documentation fix.
2015-10-19 18:36:42 -07:00
Nathan LeClaire
6cac8cc95f
Merge pull request #2015 from nathanleclaire/bump_0.5.0_rc2
...
Bump version to 0.5.0-rc2
2015-10-19 17:51:24 -07:00
Nathan LeClaire
f8491c8140
Bump version to 0.5.0-rc2
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-19 17:44:31 -07:00
Nathan LeClaire
950aa5cad2
Merge pull request #2014 from nathanleclaire/print_app_err_msg
...
Spit out at least some message when flag parsing etc. fails
2015-10-19 17:43:36 -07:00
Nathan LeClaire
56f457c2ef
Merge pull request #2013 from nathanleclaire/no_stdout_env_config
...
Ensure log writes only to os.Stderr for env and config command
2015-10-19 17:43:23 -07:00
Nathan LeClaire
5bba2b3a64
Merge pull request #2012 from nathanleclaire/forward_compat_configs
...
Add some small support for forward compatible configuration mistakes
2015-10-19 17:43:03 -07:00
Ying Li
5cdb46a9da
Accept the same ciphersuites in the client and server as docker.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:31:18 -07:00
Ying Li
fb81aaed10
Add test for if the client CA dir is empty
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:31:18 -07:00
Ying Li
fc389b7bc3
Use tls client config utility in notary as well.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:31:18 -07:00
Nathan LeClaire
c93b79abef
Spit out at least some message when flag parsing etc. fails
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-19 17:30:59 -07:00
Nathan LeClaire
17f0a32b79
Ensure log writes only to os.Stderr for env and config command
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-19 17:30:18 -07:00
Ying Li
fb1013b997
Add servername to the client TLS config, and use it to build notary-server's
...
TLS connection to notary-signer.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:29:54 -07:00
Ying Li
b399783eee
Slight refactoring of ConfigureServerTLS and added a ConfigureClientTLS
...
as well.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:29:54 -07:00
Ying Li
8d96cf0c1f
Use ConfigureServerTLS for notary-server and notary-signer
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:29:54 -07:00
Ying Li
7356dfd273
Change ConfigServerTLS to take a client CA directory instead of certs
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:29:54 -07:00
Ying Li
e50cc2c9cd
Add test to ensure that x509filestore loads existing certs from the
...
directory without modifying/overwriting them.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:29:54 -07:00
Ying Li
77dc081ead
Add a utility which generates a tls configuration for you given the
...
requisite certs.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-19 17:29:54 -07:00
Nathan LeClaire
7400a77b32
Add some small support for forward compatible configuration mistakes
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-19 17:29:17 -07:00
Ying Li
f417279d0d
Merge pull request #228 from cyli/new-vipers
...
Do not use the viper singleton instance everywhere
2015-10-19 17:29:02 -07:00
Jess Frazelle
98c01c2c90
Merge pull request #17088 from Microsoft/sjw/archive_hang_fix
...
Fixing hang in archive.CopyFileWithTar with invalid dst
2015-10-19 17:18:25 -07:00
Jess Frazelle
48147d287b
Merge pull request #17187 from mavenugo/dopts
...
Fail the container start if the network has been removed
2015-10-19 17:12:07 -07:00
Aaron Lehmann
5608db616c
Correct two golint comment issues
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-19 16:42:12 -07:00
Jessica Frazelle
14e85c8c55
add test script for built debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-19 16:15:27 -07:00
Jessica Frazelle
8369f00d30
add generate aa profile to deb install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-19 16:15:25 -07:00
Jessica Frazelle
c39689ca70
add dh-apparmor & apparmor to deb builder dockerfiles
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-19 16:15:22 -07:00
Jessica Frazelle
8cf89245f5
change default docker-engine profile to a template based on apparmor_parser version
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-19 16:15:18 -07:00
Jessica Frazelle
f549b1c9ea
fix copy of multiple rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-19 16:14:06 -07:00
Jess Frazelle
b135f758d7
Merge pull request #17186 from LK4D4/icc_clear
...
Use more clear message for icc=false + iptables=false
2015-10-19 15:40:41 -07:00
Jess Frazelle
c766bcdc73
Merge pull request #17135 from albers/completion-restart-unless-stopped
...
Bash completion for restart policy `unless-stopped`
2015-10-19 15:26:16 -07:00
Jess Frazelle
6f4d7dfbf4
Merge pull request #17148 from albers/completion-dm-options
...
bash completion: support for more devicemapper options
2015-10-19 15:25:27 -07:00
Nathan LeClaire
95f626ce21
Merge pull request #1999 from hairyhenderson/json-use-number-during-migrate-1998
...
Fixing JSON marshaling of large numbers during migration
2015-10-19 15:12:20 -07:00
Dave Henderson
486e359e63
Fixing JSON marshaling of large numbers during migration
...
- Added some context to an error message - it's useful to know _which_
plugin failed when invoking the binary failed
- Replaced `json.Umarshal` with a `json.Decoder`, so that the
`UseNumber` function can be called, which prevents large integers from
being interpreted as `float64`s.
- Fixed a couple `log.Warn` calls that should've been `log.Warnf`
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-10-19 18:00:19 -04:00
Madhu Venugopal
8755920d0d
Fail the container start if the network has been removed
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-19 15:00:07 -07:00
Olivier Gambier
21b6f54796
Merge pull request #1110 from RichardScothern/env-var-clarification
...
Clearer documentation around environment variable overrides
2015-10-19 14:53:20 -07:00
Richard Scothern
f9317483d3
Clearer documentation around environment variable overrides
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-10-19 14:52:08 -07:00
Vivek Goyal
2f16895ee9
devmapper: Drop devices lock before returning from function
...
cleanupDeleted() takes devices.Lock() but does not drop it if there are
no deleted devices. Hence docker deadlocks if one is using deferred
device deletion feature. (--storage-opt dm.use_deferred_deletion=true).
Fix it. Drop the lock before returning.
Also added a unit test case to make sure in future this can be easily
detected if somebody changes the function.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-10-19 17:51:17 -04:00
Alexander Morozov
ab495ab0d0
Use more clear message for icc=false + iptables=false
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-10-19 14:19:21 -07:00