Commit Graph

256 Commits

Author SHA1 Message Date
6ff15cb8df Merge pull request #16828 from jwayong/jwayong/docs
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
2015-10-08 10:05:44 -04:00
282a5880a8 Merge pull request #15265 from greaber/dockerignore-docs
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
2015-10-08 06:24:44 -07:00
9c388a6249 Docs: Add docker-elements to remote API client lib doc page
This closes #16824

Signed-off-by: Januar Wayong <januar@gmail.com>
Upstream-commit: 96ad26a7308b9e8b8ad52c5bfb4f0556941fc3f5
Component: engine
2015-10-08 08:45:35 +11:00
5e87c46dcd clarify dockerignore semantics
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
Upstream-commit: 899ecc11c521d536f26b2e2f062382930dd6ff99
Component: engine
2015-10-07 15:51:57 -05:00
780fae5a2c Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles
Don't put dockerfiles in one continuous code block
Upstream-commit: 4c1540c8d2bb57123a4faa769d78cdf6202d4314
Component: engine
2015-10-07 13:40:19 -07:00
6b3f6691b5 Merge pull request #16645 from mavenugo/ux
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
80c6a28fe2 Merge pull request #16807 from jfrazelle/rename-flag
change flag name to better follow the other flags that start with disable
Upstream-commit: a1c373197fe7f865ccac0ad338c213e3d1f863de
Component: engine
2015-10-07 10:40:32 -07:00
3ba7e5f650 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
af07841b68 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
2015-10-07 03:54:27 -07:00
917e7739ac Mention more realistic examples are available
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 4cb0790a620924a9fe5d751c6c7e6b37183697df
Component: engine
2015-10-07 11:45:57 +01:00
000787bb0d Don't put dockerfiles in one continuous code block
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 6a1a192e072cc44d80230626071efe756d77d373
Component: engine
2015-10-06 22:58:42 +01:00
cd659bcc9c devmapper: Provide option to enabled deferred device deletion
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.

Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 51e059e7e90f37848596a0b6ec83f7835e6e4131
Component: engine
2015-10-06 17:37:21 -04:00
a2758a7a50 Merge pull request #16647 from vdemeester/revert-env-validation-docs
Update documentation on the revert on env validation
Upstream-commit: e1d3cb89f16c90a3ec6777e34c769cc2a35d123e
Component: engine
2015-10-05 15:27:45 -07:00
c1ad8272d0 Update documentation on the revert on env validation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b3fe785c7267bff533c9b2fc324c58e37796e973
Component: engine
2015-10-04 23:04:36 +02:00
72f4bc7137 Merge pull request #16744 from runcom/fix-mam-commandline
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
b51b5af287 Fix man and commandline docs
- missing help option in `docs/reference/commandline/*.md` (some files
  have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
883f553c16 Documentation for filtering events by label
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c1713e7c5a8f2eee7d78b17eef81b0d4203aabdd
Component: engine
2015-10-02 16:45:08 -04:00
a9fcaeb043 Make exec start return proper error codes
Exec start was sending HTTP 500 for every error.

Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.

Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00
f5fe88af39 Merge pull request #16680 from dnephin/update_list_image_api_docs
Update api docs for /images/json
Upstream-commit: d6f83652588fa39753a92fd046e8b837c0ac6cd4
Component: engine
2015-10-02 11:23:49 -07:00
6f5edad812 Fix docker ps truncate long image name by default
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3fcf481361400acd5e56da2a8c76cf888092b2e4
Component: engine
2015-10-02 22:56:42 +08:00
568946688a Merge pull request #16385 from RichardScothern/v1-deprecation
Add a daemon flag to prevent contact with v1 registries.
Upstream-commit: 85244f80e324428cef3dc526d1c831ed20eac6c2
Component: engine
2015-09-30 10:10:06 -07:00
85d177c805 Fix api documenation for /images/json response format
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e5967d041d8cb57cc4ddeee6783580d9be3415f2
Component: engine
2015-09-30 12:24:34 -04:00
f40e350889 Command line, manpage and deprecation documentation.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: 4acf29a80813c8f14174390fbaf5cb74c4a7fadc
Component: engine
2015-09-28 10:31:04 -07:00
f935cc47fb Merge pull request #16229 from icecrime/discovery
Add builtin nodes discovery
Upstream-commit: 9324b154d27643caed58c12e8c49630eeceb4fda
Component: engine
2015-09-27 18:06:27 -07:00
71b700b568 Merge pull request #16109 from charleswhchan/patch-3
Touch up "Dockerfile reference"
Upstream-commit: 486c12525f27dd51c89cde910c5ea06665824095
Component: engine
2015-09-27 15:12:17 -07:00
2f753b8d99 Touch up "Dockerfile reference"
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 60f76bbfe1baaa0c1cc94b997022df6b8c44f07f
Component: engine
2015-09-27 08:04:36 -07:00
798ccba56f Merge pull request #16338 from twaugh/env-replacement-label
Add documentation note that LABEL allows environment replacement
Upstream-commit: f8f03a290c98063936643c26a0345439a25fe1a7
Component: engine
2015-09-27 08:00:53 -07:00
ff72d92410 Add builtin nodes discovery
Use `pkg/discovery` to provide nodes discovery between daemon instances.

The functionality is driven by two different command-line flags: the
experimental `--cluster-store` (previously `--kv-store`) and
`--cluster-advertise`. It can be used in two ways by interested
components:

1. Externally by calling the `/info` API and examining the cluster store
   field. The `pkg/discovery` package can then be used to hit the same
   endpoint and watch for appearing or disappearing nodes. That is the
   method that will for example be used by Swarm.
2. Internally by using the `Daemon.discoveryWatcher` instance. That is
   the method that will for example be used by libnetwork.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7d193ef1f3b5fcd6aa55b7376116e2617be12e06
Component: engine
2015-09-25 14:52:09 -07:00
58c0f4ebe8 Merge pull request #14579 from hqhq/hq_add_softlimit
Add support for memory reservation
Upstream-commit: 84b53c8d87c0ab887209a51e54fad60a591e737a
Component: engine
2015-09-24 12:11:36 -07:00
4422b77499 Merge pull request #16415 from HuKeping/dockerinfo
Format output of docker info
Upstream-commit: 40e856041265d6030768286f1b228f042c0f768b
Component: engine
2015-09-23 21:15:23 -04:00
a505c19468 fix content-type of response for /commit
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: 78de066a28c5e01524401840ff4d1ae76e8e0fc2
Component: engine
2015-09-23 23:49:16 +02:00
75633de557 Format output of docker info
Format those info which will only be displayed when daemon is
in debug mode.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 141e91c4803124bdf55dd45a06998748b0ef5fb2
Component: engine
2015-09-23 14:35:13 +08:00
4f3fe3187a Add support for memory reservation
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: aa1780997f42a3fbe3a7f9c7be2b8a5092b9b7c1
Component: engine
2015-09-23 14:02:45 +08:00
cca18b2305 Merge pull request #16428 from charleswhchan/fix-logs-doc
Touch up 'docker logs' documentation.
Upstream-commit: bfc785bf6409419cbedde4af3057ab921a5e17d8
Component: engine
2015-09-22 07:17:26 -07:00
3ddae4e8f1 Touch up 'docker logs' documentation.
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: eff524e19cb2cb6fcd6630e0aff7979e3507768c
Component: engine
2015-09-21 19:47:33 -07:00
36e8a28c25 Merge pull request #16465 from albers/reference-capability-all
reference: capability `all` should be `ALL`
Upstream-commit: 985b7ec895e75337056e8db1d7fa28e15c0b8180
Component: engine
2015-09-21 16:49:17 -04:00
022c1e60a2 reference: capability all should be ALL
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d37674b44b4b843dcdd2626b58645d9ffef2cb6e
Component: engine
2015-09-21 21:09:50 +02:00
8e71940329 add docker server version to /info
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 7cf343d1064e3d8211597c67574ff4ddff316fa1
Component: engine
2015-09-21 21:15:32 +08:00
d572cd9e37 Merge pull request #16174 from sallyom/man-restart-fix
docker restarts running OR stopped containers
Upstream-commit: 4a6e8c8f3c8d129bb06922a0d8e1e1276c254f66
Component: engine
2015-09-20 18:10:06 -07:00
4168ba7ed4 docker restarts running OR stopped containers, docs edit rm "running"
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: e41753678d5ffd6c505f1984943bc36d34e134bb
Component: engine
2015-09-20 09:16:27 -04:00
ca451265c5 Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 8d6796f8c63ae09ce35a56525a947ae1aa887b0b
Component: engine
2015-09-19 08:53:11 -07:00
cdae9e4a30 events/jsonmessage: add and prefer TimeNano for events
This way provide both Time and TimeNano in the event. For the display of
the JSONMessage, use either, but prefer TimeNano Proving only TimeNano
would break Subscribers that are using the `Time` field, so both are set
for backwards compatibility.

The events logging uses nano formatting, but only provides a Unix()
time, therefor ordering may get lost in the output. Example:
```
2015-09-15T14:18:51.000000000-04:00 ee46febd64ac629f7de9cd8bf58582e6f263d97ff46896adc5b508db804682da: (from busybox) resize
2015-09-15T14:18:51.000000000-04:00 a78c9149b1c0474502a117efaa814541926c2ae6ec3c76607e1c931b84c3a44b: (from busybox) resize
```

By having a field just for Nano time, when set, the marshalling back to
`time.Unix(sec int64, nsec int64)` has zeros exactly where it needs to.
This does not break any existing use of jsonmessage.JSONMessage, but now
allows for use of `UnixNano()` and get event formatting that has
distinguishable order. Example:
```
2015-09-15T15:37:23.810295632-04:00 6adcf8ed9f5f5ec059a915466cd1cde86a18b4a085fc3af405e9cc9fecbbbbaf: (from busybox) resize
2015-09-15T15:37:23.810412202-04:00 6b7c5bfdc3f902096f5a91e628f21bd4b56e32590c5b4b97044aafc005ddcb0d: (from busybox) resize
```

Including tests for TimeNano and updated event API reference doc.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 4026512a2c535fe377a4cf834b7a78fccfd82dab
Component: engine
2015-09-18 13:15:26 -04:00
ee9bd9e809 Merge pull request #15182 from mapuri/build-arg
Support for passing build-time variables in build context
Upstream-commit: 1ffff4c8e2b208664b6f63ea6cd3c4c3dace3cc9
Component: engine
2015-09-16 23:52:37 -04:00
bd692d4b30 log driver - add ability to interpolate container context into the log tag field
Signed-off-by: Philip Monroe <phil@philmonroe.com>
Upstream-commit: 3be7146e14d1f5ced470c0c7e3066f091f468696
Component: engine
2015-09-16 15:19:28 -07:00
655513db24 Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
5e58ae50d3 Merge pull request #15786 from HuKeping/stats-network
Refactor the statistics of network in docker stats
Upstream-commit: 259a0fb16ceac921763172127183059dea7e3c46
Component: engine
2015-09-16 20:29:16 +02:00
fd675380c0 Revert "Make daemon to start with no userlandproxy by default"
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
0b8d66eb11 Add documentation note that LABEL allows environment replacement
Signed-off-by: Tim Waugh <twaugh@redhat.com>
Upstream-commit: ea4d70bdfd55ee2018674e5878031566e58b8fd1
Component: engine
2015-09-16 14:47:01 +01:00
2051b748c0 incorporate doc review comments
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 8cfcd8738070f24bd66e3b7ed46c6459df3fa9a3
Component: engine
2015-09-16 03:31:15 -07:00
ded3de600a Support for passing build-time variables in build context
- The build-time variables are passed as environment-context for command(s)
run as part of the RUN primitve. These variables are not persisted in environment of
intermediate and final images when passed as context for RUN. The build environment
is prepended to the intermediate continer's command string for aiding cache lookups.
It also helps with build traceability. But this also makes the feature less secure from
point of view of passing build time secrets.

- The build-time variables also get used to expand the symbols used in certain
Dockerfile primitves like ADD, COPY, USER etc, without an explicit prior definiton using a
ENV primitive. These variables get persisted in the intermediate and final images
whenever they are expanded.

- The build-time variables are only expanded or passed to the RUN primtive if they
are defined in Dockerfile using the ARG primitive or belong to list of built-in variables.
HTTP_PROXY, HTTPS_PROXY, http_proxy, https_proxy, FTP_PROXY and NO_PROXY are built-in
variables that needn't be explicitly defined in Dockerfile to use this feature.

Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 54240f8da9992880e20a1508e9a6f0e59f2adef1
Component: engine
2015-09-16 03:31:15 -07:00