e025e5f279
Merge pull request #17428 from ripcurld00d/cli_ninja_build
...
Change the quiet flag behavior in the build command [closes #17623 ]
Upstream-commit: f4ea3b2cb1d864ac6f1c7063da87b62b9191aaac
Component: engine
2015-12-21 17:59:16 +01:00
1c5df6581b
Change the quiet flag behavior in the build command
...
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.
However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.
This patch makes the quiet flag behave in the following way:
1. If the build process succeeds, stdout contains the image ID
and stderr is empty.
2. If the build process fails, stdout is empty and stderr
has the error message and the diagnostic output of that process.
If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
fc63a9d65d
Merge pull request #18820 from vdemeester/oups-fix-api-ps-unit-tests
...
Fix the api/client/ps unit tests.
Upstream-commit: 67620bc0288ae7ecb12511879e6eb605e98594a1
Component: engine
2015-12-21 14:01:27 +01:00
3dcfd49f35
Fix the api/client/ps unit tests.
...
TestFormat was depending on the time so (comparing again
1970-01-01).. at some point it was bounded to fail >_<. Updating it to
be *not* time-dependent :).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bb853137bea8481037b88d16eeb6499b8ed63a81
Component: engine
2015-12-21 11:07:14 +01:00
7363973c86
Merge pull request #18804 from mqliang/patch-6
...
Update selectadriver.md
Upstream-commit: 6d04d9cda8061456b921569266ca9f996c4b7eae
Component: engine
2015-12-21 09:56:05 +01:00
51d11f3a43
update document
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 41c2dab459ff9e4075e15889b7aea03cab58ce71
Component: engine
2015-12-21 11:53:38 +08:00
afa2c3e567
Merge pull request #18798 from mqliang/patch-1
...
Update dockervolumes.md
Upstream-commit: e9f72410ae5c91133a63fbe2d2bd9b36614bc460
Component: engine
2015-12-21 01:09:52 +01:00
6c1f488ddd
Merge pull request #18801 from mqliang/patch-3
...
Update index.md
Upstream-commit: 83f28cb374f6e08e2e929ea86833c0976ce47cf3
Component: engine
2015-12-21 01:08:58 +01:00
a75804fa4f
Merge pull request #18813 from thaJeztah/update-restart-description
...
(carry 18273) update description for restart policies
Upstream-commit: 4f9ed6164de03b4bfb8693c8108ef1137522aa11
Component: engine
2015-12-21 01:04:38 +01:00
13594ddd74
Update restart description
...
add a note around restart policies only working in detached mode
Signed-off-by: Aidan Feldman <aidan.feldman@gmail.com >
Update restart description with Mary's comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c32ec8b93b199168425f29cab040d9d8cc23566f
Component: engine
2015-12-21 00:58:30 +01:00
97e9ddadc9
Merge pull request #18790 from tbonza/master
...
updated fedora yum to dnf package manager
Upstream-commit: 91b56a7c269c45a12b3c2e7643caa5dc3ca761bd
Component: engine
2015-12-20 08:46:31 -08:00
68d7fb0472
Merge pull request #18806 from mqliang/patch-8
...
Update btrfs-driver.md
Upstream-commit: 9f306364f573e99d3dd6d7db7c57a23ac27fc5a8
Component: engine
2015-12-20 17:24:29 +01:00
4fa7f47239
Update dockervolumes.md
...
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 3dd90e564c65e3a38160a6d24c036c0b0ee3c8b8
Component: engine
2015-12-20 23:41:00 +08:00
5597d2d934
Update btrfs-driver.md
...
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 8737896e421ed5a9c90a7b0e4395633ea93f8f92
Component: engine
2015-12-20 23:08:01 +08:00
35d7acd5b7
Update index.md
...
fix typo in document
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 38ee016966ef5ad8f08d42c9a0dd9effd6930c73
Component: engine
2015-12-20 23:00:38 +08:00
f64ebb2c89
Merge pull request #18794 from thaJeztah/EOL-fedora-21
...
Remove Fedora 21 from RPM build as it is EOL
Upstream-commit: cc6f0df2e41c7d01dffd8e0630c14275960130fc
Component: engine
2015-12-20 11:53:51 +01:00
0e3b79cb4d
Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
...
update syntax for empty value labels
Upstream-commit: 18925f37ed5cfb9dd54ee10ee99bc5f990f156b0
Component: engine
2015-12-19 21:53:21 -08:00
27d8c0709b
Merge pull request #18720 from kytrinyx/unspecific-ubuntu
...
docs: remove ubuntu version in dockerizing userguide
Upstream-commit: 3d43ebebfae82b4c5cf5ce0987d087e7059829aa
Component: engine
2015-12-19 21:17:38 -08:00
bfd2cf3356
Merge pull request #18667 from bboreham/inspect-json-doc
...
Improved explanation of docker inspect 'json' function
Upstream-commit: fa720ad98746eb33073af9f4fde16df4f774644f
Component: engine
2015-12-19 21:09:39 -08:00
8c7f988b73
Merge pull request #18795 from thaJeztah/o-oracle-o-oracle-where-art-thou-oracle
...
Update link to Oracle Linux
Upstream-commit: fbefbc52817ce23a07a5634126abf9a12f83b7f0
Component: engine
2015-12-20 01:33:27 +01:00
007bebfe87
Update link to Oracle Linux
...
The https://linux.oracle.com/ url results in
too many redirects, which may result in our
link-checker to think the link is broken.
Replacing the link, per discussion in
https://github.com/docker/docker/pull/18534#issuecomment-164202592
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 579d35e33c161fa20bf6cf8d0e41969d9821e378
Component: engine
2015-12-20 00:52:12 +01:00
8d399a7fd9
Remove Fedora 21 from RPM build as it is EOL
...
Fedora 21 is EOL'd as of December 1st, 2015.
Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html
Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.
Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a08c955e30d6790d1f69483d5e33e2a81a08b100
Component: engine
2015-12-20 00:42:17 +01:00
36350c1926
Merge pull request #18792 from moxiegirl/fix-typo
...
Fixing typo reported by @projectvalis
Upstream-commit: fb879e849d6a895edab097c8feed3b5f71f33770
Component: engine
2015-12-19 22:21:41 +01:00
ba3901d719
Fixing typo reported by @projectvalis
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 55a65e18c08e2612b5cc7384119e6ec44e476da7
Component: engine
2015-12-19 12:47:24 -08:00
2cab6a8278
updated fedora yum to dnf package manager Signed-off-by: Tyler Brown <tylers.pile@gmail.com>
...
Upstream-commit: 0635403536802063e8633ab04a6a825a1daa02c4
Component: engine
2015-12-19 15:04:19 -05:00
cd79f6b524
Merge pull request #18767 from wenchma/add_checkduplicate_test
...
Add network create api test on CheckDuplicate
Upstream-commit: 58c049595fba7cb509d8a6656ecce6389c34a5a5
Component: engine
2015-12-19 10:46:11 -05:00
8acdb0b4d5
Merge pull request #18684 from cdauth/volume-docs
...
Add note to volume docs that data is not copied to mounted volumes
Upstream-commit: 69fbdf4294b9c062bc711b978efcde82e40a293f
Component: engine
2015-12-19 15:29:44 +01:00
ea70c9d5d6
Add network create api test on CheckDuplicate
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 5649dae89bbbb356a24560c1d3164722b2207344
Component: engine
2015-12-19 22:29:30 +08:00
3c6477529c
Merge pull request #18769 from runcom/docs-auth-1
...
docs: extend: authorization.md: add a note about confidential stuff in Err
Upstream-commit: eaf7932fafdfdbcefa3be3ccacab016938969cf4
Component: engine
2015-12-19 14:53:25 +01:00
295cafe7dd
docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: aada8d81177de793db38845ff3a26949436e1ed6
Component: engine
2015-12-19 09:04:29 +01:00
fdba0e61b5
Merge pull request #18779 from aditirajagopal/18750-new-string-method
...
pkg/version.Version: use the new String() method
Upstream-commit: 7ff61dd592335c7b3673b41153d9cf8995e468a3
Component: engine
2015-12-18 21:21:17 -05:00
ce07d20209
Merge pull request #18763 from calavera/fix_raw_inspect
...
Print the raw inspected elements when there is no template for `docker inspect`.
Upstream-commit: 58ebc71272d3facec798664366cc169aa8df8449
Component: engine
2015-12-18 15:25:38 -08:00
4b736dc17f
Merge pull request #18651 from vbatts/dm-cleanup
...
loopback (and devicemapper) cleanup
Upstream-commit: 54f945994a0eb79c43c8c34fc77625dc56c0c421
Component: engine
2015-12-18 15:13:28 -08:00
76f3bf50c1
pkg/version.Version: use the new String() method
...
Resolves #18750
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 278e75800c7be10ca43ffb11de25cd342da106fe
Component: engine
2015-12-18 15:29:32 -05:00
cc50cf65a0
Merge pull request #18761 from anusha-ragunathan/add-build-routes
...
Create build router separate from image router.
Upstream-commit: 92605b823d4facbe9076b58dd0b0d77101529ad9
Component: engine
2015-12-18 21:09:43 +01:00
d33438344b
Merge pull request #18727 from tonistiigi/partial-load
...
Add support for partial load
Upstream-commit: 6ee7c94263e367cfc03c6f08af3bdcd28f70ed7a
Component: engine
2015-12-18 11:10:55 -08:00
d5f830baed
Merge pull request #18771 from runcom/authz-fixes-1
...
authZ: more fixes
Upstream-commit: b714e03fddc71b0d1af7a27198ae5a342b8ce39f
Component: engine
2015-12-18 17:58:02 +01:00
e5974f1fbd
Merge pull request #18773 from runcom/rej-gitignore
...
.gitignore: do not ignore *.rej
Upstream-commit: 7f62d311bdf11f2bd8792c7e90e38edf2f77ef82
Component: engine
2015-12-18 17:48:36 +01:00
3a6aede7f5
Merge pull request #18721 from tiborvass/remove-dependencies-from-builder
...
Remove image and daemon dependencies from builder
Upstream-commit: 64d70de0a2aa29f565336e896b76c23c879a9a98
Component: engine
2015-12-18 17:19:55 +01:00
a04ac83e2f
.gitignore: do not ignore *.rej
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fa7d676891d0dda30119ccfcf675a8f49c93073f
Component: engine
2015-12-18 17:12:54 +01:00
dcc6022170
Merge pull request #18561 from hqhq/hq_adapt_at_start
...
Adapt container settings when start
Upstream-commit: 1ca6690b4fbef191d242265c813cc1a4dd8ece25
Component: engine
2015-12-18 11:07:43 -05:00
8b5a2050f9
loopback: separate loop logic from devicemapper
...
The loopback logic is not technically exclusive to the devicemapper
driver. This reorganizes the code such that the loopback code is usable
outside of the devicemapper package and driver.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: af597527121c0ad973e9d0ae4f9cf970da1513cc
Component: engine
2015-12-18 10:57:43 -05:00
e963d775a7
devicemapper: remove unused type mapping
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: a292c04c01cbe4a6c9f74e7cf3b0315249ed8993
Component: engine
2015-12-18 10:44:06 -05:00
760531cbbc
Merge pull request #18730 from calavera/remove_sockets_dependency
...
Remove api client lib dependency on tlsconfig and sockets packages.
Upstream-commit: b708a2249bfa7d9a7bff74b28264fd40ca4e6d1e
Component: engine
2015-12-18 10:35:51 -05:00
d63981ab4d
authZ: more fixes
...
- fix naming and formatting
- provide more context when erroring auth
- do not capitalize errors
- fix wrong documentation
- remove ugly remoteError{}
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5a64c8027ecd2bebe773c9abd2e73c2fd7d23de1
Component: engine
2015-12-18 16:29:01 +01:00
871c2bc240
Merge pull request #18741 from WeiZhang555/debug-info
...
Better debug message for post form data
Upstream-commit: 47060efdb763305ed7c406ac3a62062d9f51ef21
Component: engine
2015-12-18 16:06:07 +01:00
7d0507241f
docs: extend: authorization.md: add a note about confidential stuff in Err
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1e28f04fec70affd8fae57f4bdd23a84853f4efc
Component: engine
2015-12-18 11:28:28 +01:00
50b12bd7e1
Print the raw inspected elements when there is no template for docker inspect.
...
Otherwise we're ignoring the fields that Swarm adds to the output.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1f5674363e4dd81c9ecd52ef3e1f252c76784697
Component: engine
2015-12-17 23:17:52 -05:00
71b76682f6
Create build router separate from image router.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: f8dc044aecd6fa00c33dc6a72321a3e249a0b40d
Component: engine
2015-12-17 16:56:11 -08:00
c737574605
Merge pull request #18759 from mikedanese/doc-fix
...
daemon/logger: fix typo in godoc
Upstream-commit: 6bf8844f1179108b9fabd271a655bf9eaaf1ee8c
Component: engine
2015-12-17 19:26:41 -05:00
