Diogo Mónica
3d54349e4a
Merge pull request #349 from endophage/server_snapshot_bugfixes
...
fixing bugs raised by @mtrmac
2015-12-14 09:42:26 -08:00
Diogo Mónica
ad1fd268af
Merge pull request #360 from docker/fix-merge-conflict
...
Fix semantic merge conflict.
2015-12-14 09:32:19 -08:00
Jean-Laurent de Morlhon
de99d4abe5
Make test a bit more resilient
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-14 18:11:35 +01:00
David Calavera
b679eb9a82
Force API versioning in the client library.
...
Remove dependencies on docker's version packages.
Allow empty version as a fallback to latest version.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-14 12:06:42 -05:00
David Gageot
7370e58ba8
Merge pull request #2575 from dgageot/fix-installation-notes
...
Fix installation notes for 0.5.3
2015-12-14 18:02:34 +01:00
Nathan LeClaire
df25736479
Merge pull request #2574 from dgageot/bump_v_0.6.0-dev
...
Update to v0.6.0-dev
2015-12-14 09:00:36 -08:00
Jeffrey Morgan
979fa6fd2a
Bump version to 0.9.4
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-12-14 08:57:30 -08:00
David Gageot
9d4ba57ce2
Fix installation notes for 0.5.3
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-14 17:55:04 +01:00
David Gageot
c86e537ae7
Update to v0.6.0-dev
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-14 17:47:44 +01:00
Daniel Nephin
96c10098ac
Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2015-12-14 11:28:02 -05:00
Tibor Vass
44299989b2
Merge pull request #18631 from tiborvass/cleanup-utils
...
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
2015-12-14 17:22:01 +01:00
Daniel Nephin
5b321e3287
Move AuthConfig to api/types
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2015-12-14 11:22:01 -05:00
David Gageot
4d39a66899
Merge pull request #2573 from dgageot/bump_v0.5.3
...
Bump to version 0.5.3
2015-12-14 16:45:40 +01:00
toli
0d824c760e
Removing the restriction to push to a 'official' repo
...
Signed-off-by: toli <toli@docker.com >
2015-12-14 07:45:00 -08:00
Vivek Goyal
f988c98ff3
Add some unit and integration tests
...
Add a unit test and couple of integration tests for volume propagation.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-12-14 10:39:53 -05:00
Vivek Goyal
d4b4ce2588
Check Propagation properties of source mount point
...
Whether a shared/slave volume propagation will work or not also depends on
where source directory is mounted on and what are the propagation properties
of that mount point. For example, for shared volume mount to work, source
mount point should be shared. For slave volume mount to work, source mount
point should be either shared/slave.
This patch determines the mount point on which directory is mounted and
checks for desired minimum propagation properties of that mount point. It
errors out of configuration does not seem right.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-12-14 10:39:53 -05:00
Vivek Goyal
a2dc4f79f2
Add capability to specify mount propagation per volume
...
Allow passing mount propagation option shared, slave, or private as volume
property.
For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-12-14 10:39:53 -05:00
David Gageot
d3041c3166
Bump to version 0.5.3
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-14 16:36:39 +01:00
David Gageot
5dd64c6bf8
Merge pull request #2572 from jeanlaurent/osversion
...
Add OS Version to crash report
2015-12-14 15:43:00 +01:00
Jean-Laurent de Morlhon
eaf2641b49
Merge pull request #2569 from askb/docs_fixes
...
minor fix to formatting update for `dm config` output
2015-12-14 15:38:21 +01:00
Jean-Laurent de Morlhon
a88f1011ad
Merge pull request #2570 from dgageot/2280-prevent-nil-dereference
...
2280 prevent nil dereference
2015-12-14 15:36:29 +01:00
Jean-Laurent de Morlhon
8faaa2a51f
Add OS Version to crash report
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-14 15:34:18 +01:00
David Gageot
f66655fd77
FIX #2280 prevent nil dereference
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-14 15:24:57 +01:00
Vincent Demeester
5e0283effa
Merge pull request #18618 from dnephin/refactor_resolve_auth_config
...
Refactor ResolveAuthConfig to remove the builder dependency on cli code
2015-12-14 15:23:36 +01:00
Jean-Laurent de Morlhon
8090f1d1c0
Merge pull request #2571 from dgageot/increase-provision-timeout
...
Increase the provisioning timeout
2015-12-14 15:22:44 +01:00
Tibor Vass
63e3816c1d
utils: move dockerignore function to builder/dockerignore
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-12-14 14:59:52 +01:00
Tibor Vass
135cca6f52
utils: move git functions to pkg/gitutils
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-12-14 14:59:52 +01:00
David Gageot
f09bbb8f7f
Increase the provisioning timeout
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-14 14:15:51 +01:00
Anil Belur
339b5ac743
Fixes a minor formatting update for dm config output
...
Signed-off-by: Anil Belur <askb23@gmail.com >
2015-12-14 18:30:17 +05:30
Antonio Murdaca
f8bc4ed573
Merge pull request #18112 from daehyeok/fix_dry_run_test
...
Change TestRunNonRootUserResolvName Fail log.
2015-12-14 13:31:17 +01:00
Antonio Murdaca
f7ed97a630
layer: layer_store.go: return on error
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-12-14 12:03:39 +01:00
Antonio Murdaca
5fd9a8f603
Merge pull request #18616 from calavera/move_client_version_to_docker_cli
...
Move client version to the docker cli.
2015-12-14 11:43:01 +01:00
David Gageot
5af18c9972
Merge pull request #2562 from nathanleclaire/strip_log_secrets
...
Strip certs and keys in log before sending to Bugsnag
2015-12-14 08:45:00 +01:00
David Gageot
5ced4fe387
Merge pull request #2564 from nathanleclaire/docs_polish
...
Add docs polish for 0.5.3 release
2015-12-14 08:43:28 +01:00
Jeffrey Morgan
10ddf62efb
Merge pull request #347 from docker/machine-error-report
...
Add & remove no-error-report file for machine 0.5.3
2015-12-13 19:35:30 -08:00
Jeffrey Morgan
c26965ccc5
Add error reporting file for machine
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-12-13 19:13:26 -08:00
Daehyeok Mun
ba6b69adc2
Change TestRunNonRootUserResolvName Fail log.
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
2015-12-13 19:59:51 -07:00
Jeffrey Morgan
0cc18ddf9b
Merge pull request #1301 from docker/fix-bash-entrypoint
...
Fix bug where container would be run with bash even thought it has a valid entrypoint
2015-12-13 18:39:06 -08:00
Jeffrey Morgan
ad0d7e003f
Fix bug where container would be run with bash even with a valid entrypoint
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-12-13 18:37:05 -08:00
Jeffrey Morgan
fe50b66c88
Merge pull request #1300 from docker/fix-vtx-exec
...
Dont track VTX as an error & fix bugs relating to exec on windows
2015-12-13 18:21:19 -08:00
Jeffrey Morgan
13537af0bc
Fix bugs related to exec and dont track VTX as an error
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-12-13 18:12:27 -08:00
Zhou Weitao
72db0bbc04
Typo
...
Signed-off-by: Weitao Zhou <wtzhou@dataman-inc.com >
2015-12-14 09:55:10 +08:00
Jeffrey Morgan
07c3c67bf5
Merge pull request #1295 from docker/fix-volume-settings-bugs
...
Fix bug where renaming or editing container settings would cause volume settings to be lost
2015-12-13 17:47:55 -08:00
Antonio Murdaca
ec1002db58
Merge pull request #18623 from jutaz/bugfix/typos
...
Bugfix - Typos
2015-12-13 19:52:31 +01:00
manchoz
824ae85632
Add support for Arch Linux ARM. ( Close #16695 )
...
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Switch to "case"
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Support multiple ARM architectures
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Add check for ArchLinuxARM Keyring
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
mkimage-arch.sh: Fix for merging
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
2015-12-13 19:48:40 +01:00
Justas Brazauskas
927b334ebf
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
2015-12-13 18:04:12 +02:00
Sebastiaan van Stijn
f5e6b09783
Merge pull request #18620 from jeffjohnston/DOC-16770
...
Update configuring Docker article
2015-12-13 14:10:46 +01:00
Lei Jitang
c427131c94
update network settings on container creating
...
To make docker inspect return a consistent result of networksettings
for created container and stopped container, it's bettew to update
the network settings on container creating.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-12-13 02:34:44 -05:00
moxiegirl
94026969b4
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
2015-12-12 21:39:34 -08:00
Jeffrey Morgan
862ed0e0d4
Merge pull request #319 from nerro/310-optional-git-installation
...
Make Git installation optional
2015-12-12 21:36:35 -08:00