Commit Graph

20772 Commits

Author SHA1 Message Date
Sebastiaan van Stijn f4ea3b2cb1 Merge pull request #17428 from ripcurld00d/cli_ninja_build
Change the quiet flag behavior in the build command [closes #17623]
2015-12-21 17:59:16 +01:00
Boaz Shuster 60b4db7eb1 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>
2015-12-21 16:38:50 +02:00
Sebastiaan van Stijn 67620bc028 Merge pull request #18820 from vdemeester/oups-fix-api-ps-unit-tests
Fix the api/client/ps unit tests.
2015-12-21 14:01:27 +01:00
Vincent Demeester bb853137be 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>
2015-12-21 11:07:14 +01:00
Sebastiaan van Stijn 6d04d9cda8 Merge pull request #18804 from mqliang/patch-6
Update selectadriver.md
2015-12-21 09:56:05 +01:00
mqliang 41c2dab459 update document
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-21 11:53:38 +08:00
Sebastiaan van Stijn e9f72410ae Merge pull request #18798 from mqliang/patch-1
Update dockervolumes.md
2015-12-21 01:09:52 +01:00
Sebastiaan van Stijn 83f28cb374 Merge pull request #18801 from mqliang/patch-3
Update index.md
2015-12-21 01:08:58 +01:00
Sebastiaan van Stijn 4f9ed6164d Merge pull request #18813 from thaJeztah/update-restart-description
(carry 18273) update description for restart policies
2015-12-21 01:04:38 +01:00
Aidan Feldman c32ec8b93b 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>
2015-12-21 00:58:30 +01:00
moxiegirl 91b56a7c26 Merge pull request #18790 from tbonza/master
updated fedora yum to dnf package manager
2015-12-20 08:46:31 -08:00
Sebastiaan van Stijn 9f306364f5 Merge pull request #18806 from mqliang/patch-8
Update btrfs-driver.md
2015-12-20 17:24:29 +01:00
Liang Mingqiang 3dd90e564c Update dockervolumes.md
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:41:00 +08:00
Liang Mingqiang 8737896e42 Update btrfs-driver.md
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:08:01 +08:00
Liang Mingqiang 38ee016966 Update index.md
fix typo in document

Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:00:38 +08:00
Antonio Murdaca cc6f0df2e4 Merge pull request #18794 from thaJeztah/EOL-fedora-21
Remove Fedora 21 from RPM build as it is EOL
2015-12-20 11:53:51 +01:00
moxiegirl 18925f37ed Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
update syntax for empty value labels
2015-12-19 21:53:21 -08:00
moxiegirl 3d43ebebfa Merge pull request #18720 from kytrinyx/unspecific-ubuntu
docs: remove ubuntu version in dockerizing userguide
2015-12-19 21:17:38 -08:00
moxiegirl fa720ad987 Merge pull request #18667 from bboreham/inspect-json-doc
Improved explanation of docker inspect 'json' function
2015-12-19 21:09:39 -08:00
Sebastiaan van Stijn fbefbc5281 Merge pull request #18795 from thaJeztah/o-oracle-o-oracle-where-art-thou-oracle
Update link to Oracle Linux
2015-12-20 01:33:27 +01:00
Sebastiaan van Stijn 579d35e33c 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>
2015-12-20 00:52:12 +01:00
Sebastiaan van Stijn a08c955e30 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>
2015-12-20 00:42:17 +01:00
Sebastiaan van Stijn fb879e849d Merge pull request #18792 from moxiegirl/fix-typo
Fixing typo reported by @projectvalis
2015-12-19 22:21:41 +01:00
Mary Anthony 55a65e18c0 Fixing typo reported by @projectvalis
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-19 12:47:24 -08:00
tbonza 0635403536 updated fedora yum to dnf package manager Signed-off-by: Tyler Brown <tylers.pile@gmail.com> 2015-12-19 15:04:19 -05:00
Doug Davis 58c049595f Merge pull request #18767 from wenchma/add_checkduplicate_test
Add network create api test on CheckDuplicate
2015-12-19 10:46:11 -05:00
Sebastiaan van Stijn 69fbdf4294 Merge pull request #18684 from cdauth/volume-docs
Add note to volume docs that data is not copied to mounted volumes
2015-12-19 15:29:44 +01:00
Wen Cheng Ma 5649dae89b Add network create api test on CheckDuplicate
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-19 22:29:30 +08:00
Sebastiaan van Stijn eaf7932faf Merge pull request #18769 from runcom/docs-auth-1
docs: extend: authorization.md: add a note about confidential stuff in Err
2015-12-19 14:53:25 +01:00
Antonio Murdaca aada8d8117 docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-19 09:04:29 +01:00
Doug Davis 7ff61dd592 Merge pull request #18779 from aditirajagopal/18750-new-string-method
pkg/version.Version: use the new String() method
2015-12-18 21:21:17 -05:00
Alexander Morozov 58ebc71272 Merge pull request #18763 from calavera/fix_raw_inspect
Print the raw inspected elements when there is no template for `docker inspect`.
2015-12-18 15:25:38 -08:00
David Calavera 54f945994a Merge pull request #18651 from vbatts/dm-cleanup
loopback (and devicemapper) cleanup
2015-12-18 15:13:28 -08:00
Aditi Rajagopal 278e75800c pkg/version.Version: use the new String() method
Resolves #18750

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-12-18 15:29:32 -05:00
Antonio Murdaca 92605b823d Merge pull request #18761 from anusha-ragunathan/add-build-routes
Create build router separate from image router.
2015-12-18 21:09:43 +01:00
David Calavera 6ee7c94263 Merge pull request #18727 from tonistiigi/partial-load
Add support for partial load
2015-12-18 11:10:55 -08:00
Vincent Demeester b714e03fdd Merge pull request #18771 from runcom/authz-fixes-1
authZ: more fixes
2015-12-18 17:58:02 +01:00
Tibor Vass 7f62d311bd Merge pull request #18773 from runcom/rej-gitignore
.gitignore: do not ignore *.rej
2015-12-18 17:48:36 +01:00
Vincent Demeester 64d70de0a2 Merge pull request #18721 from tiborvass/remove-dependencies-from-builder
Remove image and daemon dependencies from builder
2015-12-18 17:19:55 +01:00
Antonio Murdaca fa7d676891 .gitignore: do not ignore *.rej
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 17:12:54 +01:00
Phil Estes 1ca6690b4f Merge pull request #18561 from hqhq/hq_adapt_at_start
Adapt container settings when start
2015-12-18 11:07:43 -05:00
Vincent Batts af59752712 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>
2015-12-18 10:57:43 -05:00
Vincent Batts a292c04c01 devicemapper: remove unused type mapping
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-12-18 10:44:06 -05:00
Brian Goff b708a2249b Merge pull request #18730 from calavera/remove_sockets_dependency
Remove api client lib dependency on tlsconfig and sockets packages.
2015-12-18 10:35:51 -05:00
Antonio Murdaca 5a64c8027e 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>
2015-12-18 16:29:01 +01:00
Antonio Murdaca 47060efdb7 Merge pull request #18741 from WeiZhang555/debug-info
Better debug message for post form data
2015-12-18 16:06:07 +01:00
Antonio Murdaca 1e28f04fec docs: extend: authorization.md: add a note about confidential stuff in Err
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 11:28:28 +01:00
David Calavera 1f5674363e 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>
2015-12-17 23:17:52 -05:00
Anusha Ragunathan f8dc044aec Create build router separate from image router.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-12-17 16:56:11 -08:00
Doug Davis 6bf8844f11 Merge pull request #18759 from mikedanese/doc-fix
daemon/logger: fix typo in godoc
2015-12-17 19:26:41 -05:00