Commit Graph

4116 Commits

Author SHA1 Message Date
03b8b15474 Merge pull request #16274 from opreaadrian/rest-api-documentation-syntax-error
Rest api documentation syntax error
Upstream-commit: 084f8060e28842fa6d23aa8b83ea357a2650cc41
Component: engine
2015-09-14 19:40:59 +02:00
203dc7867a Merge pull request #16253 from AmeBel/update-documentation-on-run
add a documentation note on backslash usage in shell form of RUN
Upstream-commit: 621143a6413dcc0cdd347cc91081e2865fe505fb
Component: engine
2015-09-14 06:32:20 -07:00
a212a2f525 update documentation styling as per suggestions
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 30164588d6be5d5a07b079719f15cf2da06322d2
Component: engine
2015-09-14 19:08:27 +08:00
c88accb730 Fix typos in REST API documentation
Replace comma with column
Remove extra curly brace

Fix typo in REST API documentation

Replace comma with column in documentation.

Signed-off-by: Adrian Oprea <adrian@codesi.nz>

Remove extra curly brace

Remove extra curly brace from remote API docs.

Signed-off-by: Adrian Oprea <adrian@codesi.nz>
Upstream-commit: 18d856f55adfd37da5023867e9a63bbfe331dc01
Component: engine
2015-09-14 11:18:41 +03:00
0982faaaa2 Merge pull request #16241 from jaxgeller/fix-installation-docs
fix typo and cleanup docs for installation.
Upstream-commit: 21cc0ac2c60fd63cfb2041236a84d89c68fdb284
Component: engine
2015-09-14 09:23:33 +10:00
b962eefd8c Fix Ubuntu instalation doc.
Formatting, break `sudo ...` command into 2 lines.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 6b16c154f56f2b4b62d623ce140ed2bb8994a1f2
Component: engine
2015-09-13 13:29:50 -07:00
66cf279f4c add a documentation note on backslash usage in shell form of RUN
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 6a55d953349eddaf502ff2db6c727e97a5dde3db
Component: engine
2015-09-12 15:42:18 +08:00
f294888a6f Merge pull request #16100 from ZJU-SEL/fix-document-about-vol
fix doc about vol
Upstream-commit: 9d0954a83d6c7b52287a62f8ab7ad42d544322a0
Component: engine
2015-09-12 02:50:49 +02:00
862065b3b2 Add log reading to the journald log driver
If a logdriver doesn't register a callback function to validate log
options, it won't be usable.  Fix the journald driver by adding a dummy
validator.

Teach the client and the daemon's "logs" logic that the server can also
supply "logs" data via the "journald" driver.  Update documentation and
tests that depend on error messages.

Add support for reading log data from the systemd journal to the
journald log driver.  The internal logic uses a goroutine to scan the
journal for matching entries after any specified cutoff time, formats
the messages from those entries as JSONLog messages, and stuffs the
results down a pipe whose reading end we hand back to the caller.

If we are missing any of the 'linux', 'cgo', or 'journald' build tags,
however, we don't implement a reader, so the 'logs' endpoint will still
return an error.

Make the necessary changes to the build setup to ensure that support for
reading container logs from the systemd journal is built.

Rename the Jmap member of the journald logdriver's struct to "vars" to
make it non-public, and to make it easier to tell that it's just there
to hold additional variable values that we want journald to record along
with log data that we're sending to it.

In the client, don't assume that we know which logdrivers the server
implements, and remove the check that looks at the server.  It's
redundant because the server already knows, and the check also makes
using older clients with newer servers (which may have new logdrivers in
them) unnecessarily hard.

When we try to "logs" and have to report that the container's logdriver
doesn't support reading, send the error message through the
might-be-a-multiplexer so that clients which are expecting multiplexed
data will be able to properly display the error, instead of tripping
over the data and printing a less helpful "Unrecognized input header"
error.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
Upstream-commit: e611a189cb3147cd79ccabfe8ba61ae3e3e28459
Component: engine
2015-09-11 16:50:03 -04:00
68a732e052 Make daemon to start with no userlandproxy by default
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e
Component: engine
2015-09-11 11:58:35 -07:00
a1b4b00b8e fix typo and cleanup docs for installation.
Signed-off-by: Jackson Geller <jacksongeller@gmail.com>
Upstream-commit: 9746021f1a36222111dff1ef95904ba39cc81db5
Component: engine
2015-09-11 13:06:54 -04:00
f85db4289c fix doc about vol
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: af14c6e7aa369ebca640ccb0197f9afbfd2e749a
Component: engine
2015-09-11 10:49:39 +08:00
1e38e54eff Add STOPSIGNAL instruction to dockerfiles.
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3781cde61ff10b1d9114ae5b4c5c1d1b2c20a1ee
Component: engine
2015-09-10 19:56:05 -04:00
d563cc164c Signal to stop a container.
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0e50d946a25beb134bce2aaf4a209b5cfcbacf8f
Component: engine
2015-09-10 19:56:05 -04:00
9f56a7069d Added tags list to /images/:id/json api.
It closes #10139.

Signed-off-by: Rozhnov Alexandr <nox73@ya.ru>
Upstream-commit: e9e68fa2d29a5e3053fb876b19b5ac5bc6d1c222
Component: engine
2015-09-10 11:55:01 +03:00
a90d6930ab Remove stray please
Signed-off-by: Trevor <trevinwoodstock@gmail.com>
Upstream-commit: 012bdac6d68f006351e43b11b258259f4af26e20
Component: engine
2015-09-09 21:21:23 -04:00
b09dc49663 Merge pull request #15495 from samuelkarp/awslogs-logging-driver
Add awslogs driver for Amazon CloudWatch Logs
Upstream-commit: 9f517fc5bb95758d66a0c9d48ae9ece202352948
Component: engine
2015-09-09 17:19:39 -07:00
4eee792b71 Merge pull request #16023 from mikebrow/12854-update-irc-webpage
refresh where to chat page; and add IRCCloud to IRC Quickstart
Upstream-commit: 8855bf350026a27a6615fa057d176b28715d77d5
Component: engine
2015-09-09 17:14:28 -07:00
0199cb8013 Merge pull request #16188 from albers/docs-volume-help
Update docs and man pages for `docker volume` subcommands
Upstream-commit: b154a6f68eb289125117d8be5bcefaa508e79dca
Component: engine
2015-09-09 17:13:21 -07:00
56082f8faa Add awslogs driver for Amazon CloudWatch Logs
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 3effe484e6f572298d0c3490517f57391617aa51
Component: engine
2015-09-09 13:52:40 -07:00
5f65695cc8 addressing useability comments per @moxiegirl
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: 82fce531031d9974013390ead67456d39fb070e9
Component: engine
2015-09-09 14:59:30 -05:00
fb110ef322 update docker volume man pages
- added --help option
- fixed several formatting problems

Also added --help to volume inspect reference page.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2724010364e6d7d316a244ae37850e8c91abb87c
Component: engine
2015-09-09 19:16:39 +02:00
8f57866c62 Linux 2.6.26 is now 7 years ago :)
Signed-off-by: Georgi Hristozov <georgi@forkbomb.nl>
Upstream-commit: e514fabfac00798449bc07c5cdb419fd04a9c684
Component: engine
2015-09-09 15:06:02 +03:00
762165daa3 Minor formating changes
- Changed ";" to "." at the end of bullet points for consistency

Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
Upstream-commit: f8308a496565a85eb01100e5645e54f80ba76c83
Component: engine
2015-09-09 00:21:22 -07:00
787635e646 Added periods at the end of bullet points for consistency
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
Upstream-commit: 2022fa81fff0d9dc49045743e82a5838f82f8bb8
Component: engine
2015-09-08 23:17:10 -07:00
154c412ece Merge pull request #15798 from calavera/volume_driver_host_config
Move VolumeDriver to HostConfig to make containers portable.
Upstream-commit: 9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Component: engine
2015-09-08 22:05:40 -04:00
03dac92f8b Merge pull request #16153 from calavera/missing_ps_placeholder
Add missing ps placeholder to the docs.
Upstream-commit: 9fdb626bfbd7fc2939582fff444bfbfbc7e0c645
Component: engine
2015-09-08 13:42:10 -07:00
fc4148454c Add missing ps placeholder to the docs.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 914905f4526cbaf9e8b2179df42572ed8702e432
Component: engine
2015-09-08 16:12:26 -04:00
516a0b9247 Merge pull request #15368 from jengeb/docs-docker-start
[docs] Add instruction to start docker on Ubuntu
Upstream-commit: 1947ab6c1ef7517ac5a66dd11e02809f8f1cdc85
Component: engine
2015-09-08 11:59:13 -07:00
c50d0a0555 Fix usage for docker volume inspect and docker volume rm
For both commands, volume is _not_ optional. Several volumes may
be specified.
Both commands now use the same name (VOLUME) for the command argument.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 00eaa7e1f53d9100e95af80d8a05f8e77e380464
Component: engine
2015-09-08 09:14:57 -07:00
e62da4815d Typo in cp.md
Closes #16124

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a14a31ed408357535e6c0fdd5d0d21e51042ab1e
Component: engine
2015-09-07 18:19:54 -07:00
5ad1da9bcf Merge pull request #16064 from pachyderm/master
Add link to Pachyderm PFS volume driver plugin in plugins.md
Upstream-commit: 12058f3a75cf4554229a7ec0f50393a829b3475b
Component: engine
2015-09-08 10:59:57 +10:00
65a716fd85 Fix minor typo in docs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 45368779f86c2f0e78a6703bf64a0b149251b8b5
Component: engine
2015-09-07 21:16:47 +02:00
d57ee25057 move pachyderm PFS link above rex ray link in docs/extend/plugins.md
Signed-off-by: Peter Edge <peter.edge@gmail.com>
Upstream-commit: f4fb4796a10d6d69f02adcca3114849ea7ef6e23
Component: engine
2015-09-07 00:36:14 +02:00
6bc8a956a6 Add link to Pachyderm PFS volume driver plugin in plugins.md
Signed-off-by: Peter Edge <peter.edge@gmail.com>
Upstream-commit: 23b33aef1e6c42353b1c877cdfa109fbab95efa1
Component: engine
2015-09-07 00:36:03 +02:00
350911ed1c Move VolumeDriver to HostConfig to make containers portable.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 6549d6517bf9a7c79d21a86cbf36af10fcdbfbe0
Component: engine
2015-09-04 12:42:44 -04:00
b590ee7334 add --insecure-registry warning to online docs
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 5446aac0e539a465a37efbe80c1608f718fe03b6
Component: engine
2015-09-04 10:28:35 -04:00
748f1e1ebb [doc] Rephrase Ubuntu installation
Signed-off-by: Jenny Gebske <jennifer@gebske.de>
Upstream-commit: ffc8d4e204b3639a76182e12d27f110986fd79bb
Component: engine
2015-09-03 22:07:33 +02:00
3b4e85f885 Clean latest api doc from PortMapping and outdated error check
Regarding the outdated error check, there's no `docker.PortMapping`
struct anymore and this is linked to something really old #1334

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 137c12f19a6838eeebfd45c459b883bb69f53d36
Component: engine
2015-09-03 11:01:55 +02:00
34cffe24d5 Merge pull request #15984 from jlhawn/document_build_auth_config
[docs] Add description of "X-Registry-Config"
Upstream-commit: ee4de4d16342787335047528e6459411fedcfcc0
Component: engine
2015-09-03 08:40:34 +02:00
186d7f8a00 [docs] Add description of "X-Registry-Config"
The structure of this header has never been specified in the docs and has
been a pain point for those who have tried to get registry authentication
to work during builds. This Patch *finally* adds a description of JSON
object which should be base64-url-safe-encoded and used as the value of
the X-Registry-Config HTTP request header during `POST /build`.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 61de9629799094d579068899ca407d5034183e0f
Component: engine
2015-09-01 10:05:30 -07:00
cada1c181e Fix issue #15939: Hyperlink to MongoDB Dockerfile not found. Replaced with link to file in Github.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: f814ae437fa622c185e544d24bf0662b2337c91a
Component: engine
2015-08-31 19:28:36 -07:00
156b9cd3aa Merge pull request #15926 from moxiegirl/carry-15210
add: best practice for security when sharing host directories.
Upstream-commit: c844effeda1af144eee964e62528d7b362bb33a3
Component: engine
2015-08-31 19:51:15 +02:00
c29130b3da updating again.
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7271dca8cc4570a28feba5a45153497dd452d899
Component: engine
2015-08-31 09:56:35 -07:00
50f9987d87 Updating with SEb's comments
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 95495d20bec49ae338e6fc10f5d4be71bd162370
Component: engine
2015-08-31 09:54:15 -07:00
4d130b40c6 Merge pull request #15920 from mikebrow/docker-engine-update-to-index
Adding additional instructions to the Docker Engine installation/inde…
Upstream-commit: 38ac1f908e07877a1b2d26f73755a45b2ceb240c
Component: engine
2015-08-31 09:35:34 -07:00
07ea70de30 add: best practice for security when sharing host directories.
Closes and carries PR #15210
Updating with Seb's comment

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b0fd4f882fd9b8c38a004395ea44b32f06431345
Component: engine
2015-08-31 09:32:42 -07:00
757943440e Adding additional instructions to the Docker Engine installation/index page per discussions with @moxiegirl.
Removed the "Other Linux" heading; Changed the "Next Steps" heading to "Where to go After Installing"

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: e9eaef6f1e85e949980806e979416c8fb03af2b9
Component: engine
2015-08-31 10:25:41 -05:00
743472f299 Warning message for lvm devmapper running on top of loopback devices
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 4870fb36d4ab1ef221cdcd95644cb19f6da0217a
Component: engine
2015-08-31 10:35:48 -04:00
a76fd41e6b Merge pull request #15932 from lyndaoleary/15909-daemon-flag
Removed deprecated -d flag from docs
Upstream-commit: e137f2d08187550393048295d8238dc18fe2e06f
Component: engine
2015-08-29 22:10:35 -04:00