Commit Graph

2133 Commits

Author SHA1 Message Date
9b55fc0736 Deprecate --restart on the daemon
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 25c519e829640ebb23061b82c6ace88c5983b63d
Component: engine
2014-08-13 16:08:50 -07:00
623a65a209 Update docs based on feedback from review for --restart
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 617edd89f48a7082bf4ec1d28ec12eefd1057a2f
Component: engine
2014-08-13 15:57:37 -07:00
ed9f19284d Add documentation and update restart rules.
Implement time backed backoff for restarting and fix failure count when
the maximum is 0

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 860c13b788944410a98a6ad5b5cfb74de0a8405b
Component: engine
2014-08-13 15:57:37 -07:00
fc0d245526 Move remote API config out of daemon/
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 1d10c55aec891df609d36c90ee6c30adb24c16c4
Component: engine
2014-08-13 19:25:51 +00:00
779c425729 Merge pull request #6162 from vbatts/vbatts-ps_filter
docker ps: introducing filters
Upstream-commit: c9c271858a652583ba548cb2ea75df68b51a9dd3
Component: engine
2014-08-13 11:44:48 -07:00
acbbac3aa0 docker ps: introducing filters
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review

This requires https://github.com/dotcloud/docker/pull/4430

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 84146719d8b8322e302e7a0250fe8a3ee1a4edcd
Component: engine
2014-08-13 09:12:33 -04:00
ca40497b63 Update postgresql_service.md
fix typo
Upstream-commit: 99423e7e1ef7d833e333389b15a372179734c03f
Component: engine
2014-08-12 23:30:04 -05:00
547d1e2095 Merge pull request #7531 from ChristopherBiscardi/priv-repos
Private Repos Copy Change
Upstream-commit: d42326d9277dd12946981c7435d468807c462157
Component: engine
2014-08-12 09:50:21 -04:00
f5781e0e49 Updates docs regarding linux mint troubleshot
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br>
Upstream-commit: fcddecc828a95083db8975391e623289b2fe1254
Component: engine
2014-08-12 02:56:57 -03:00
b38de9ff8f tell the user what to expect, including that it is a verbode process.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: b94f2c4c6d6fa7b3efc0dbf8874735b12d00b57c
Component: engine
2014-08-12 10:32:38 +10:00
9379864263 Private Repos Copy Change
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com> (github: ChristopherBiscardi)
Upstream-commit: df9650eebb12d980aaf114ac7b2223764dc964b7
Component: engine
2014-08-11 16:37:58 -07:00
09bdb7ffa9 Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive
Add "DEBIAN_FRONTEND" to FAQ
Upstream-commit: 8595a4ff7a18f6eb80e28d49d4dbecca794b369e
Component: engine
2014-08-11 14:19:06 -07:00
1b06736c1b Add "DEBIAN_FRONTEND" to FAQ
Added some explanation on using ‘DEBIAN_FRONTEND’ to the FAQs. As
discussed here;
https://github.com/docker/docker/pull/7035#issuecomment-50967867

Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
Upstream-commit: 2e5d35c1f1bf0b565b288fa9146059d9f3af61b7
Component: engine
2014-08-11 23:12:47 +02:00
3182bc2e13 Merge pull request #7489 from duglin/7281
fix for issue 7281
Upstream-commit: 9fa4bea03b13923c399e9244808a83d007f93662
Component: engine
2014-08-10 13:27:21 -04:00
9c2865f2e8 Merge pull request #7498 from ostezer/fix-builds-errors
Docs: Fix builds.md line-length + minor typo issues
Upstream-commit: dfd6fcb5489f890dcd62a13f09d2a6bb497b5bd4
Component: engine
2014-08-10 13:26:16 -04:00
e7a62680bf Merge pull request #7501 from wyc/patch-1
Update gentoolinux.md
Upstream-commit: 7b13212076d0161ce7a81c56f6cc8ef54e6142ff
Component: engine
2014-08-10 13:20:14 -04:00
58ea0dfc63 Merge pull request #7514 from phemmer/cli_cmd_prefix_fix
fix command output examples in cli documentation
Upstream-commit: aa3bc6559b2784f832ad86b039a993cac6e9c63d
Component: engine
2014-08-10 13:18:50 -04:00
6959cc9071 fix command output examples in cli documentation
f87a97f accidentally added a few too many `$` line prefixes

Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
Upstream-commit: d613f1121751dd76939b9089d60729e6ed6140a6
Component: engine
2014-08-10 12:47:46 -04:00
wyc
eacd91aa24 Update gentoolinux.md
Upstream-commit: 6ba1949e6aed4b8a6d81b9ad4a43a4743f39ac32
Component: engine
2014-08-09 14:00:29 -04:00
811bdfdcea fix for issue 7281
add missing comma per O.S. Tezer's commment

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 55dc4f2b94f68e9e1b4e73b1f21cf5151f86e8f8
Component: engine
2014-08-09 08:11:59 -04:00
31a920688e Docs: Fix builds.md line-length + minor typo issues
This PR proposes to fix some already existing (i.e., older)
line-length & line-alignment issues and the ones recently
included/merged with the PR #7406
(https://github.com/docker/docker/pull/7406).

It also proposes to fix a couple minor typography mistakes
(i.e., spelling of GitHub and Service Hooks (headers))

This PR does *not* propose any content changes.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 8b3f2381d0a842bc39c34c39647722fc783d968c
Component: engine
2014-08-09 14:55:47 +03:00
73581056c0 Merge pull request #7406 from hollietealok/docs_add
Added "Github Submodules" section to Automated Builds doc.
Upstream-commit: 2dc21af70b764cb7f3984b576fdfa049cad87c6c
Component: engine
2014-08-08 09:40:42 -07:00
a4dc156e24 Merge pull request #7465 from flavio/update-opensuse-doc
Updated openSUSE's installation instructions
Upstream-commit: fb650d1e6d938240c3e2058e3d8dc9eb75128435
Component: engine
2014-08-08 11:28:27 -04:00
f9e96cf7d4 Updated openSUSE's installation instructions
Cover network configuration and reference the official openSUSE image
inside of the examples.

Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com> (github: flavio)
Upstream-commit: 90e97960fa2282189f16b44a8699b3c6ec12e520
Component: engine
2014-08-08 12:36:20 +02:00
a345fa1cd7 Merge pull request #7278 from Toebez/patch-1
Update nodejs_web_app.md
Upstream-commit: 33d6b20c133348fed0d803fbe350b5a663974345
Component: engine
2014-08-07 23:16:37 -04:00
7b0cf887d4 Merge pull request #7460 from suzaku/fix_docs
Make it clear that JSON array format should be used if CMD is used as default arguments
Upstream-commit: 0ca010695cc504c1a27cfb939e2580e0515caec1
Component: engine
2014-08-08 12:10:01 +10:00
722d8e53b5 Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation
Revert --stop/--kill and use SIGKILL instead
Upstream-commit: 414ccee23a25df258f9496e721dbfb6f1773ea9a
Component: engine
2014-08-07 16:47:25 -07:00
a79d7ec92b Revert rm -f deprecation use SIGKILL instead
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 95f86da641dfec9b3db88e0f0a8457685361a871
Component: engine
2014-08-07 18:20:43 -04:00
3c371660e7 Use pure go markdown processor to generate man files
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 3f136dc0e0feb826eb67c2c2d600ee681a16bb02
Component: engine
2014-08-07 07:06:39 -04:00
bde3f4cb22 Make it clear that JSON array format should be used if CMD is used as default arguments
Signed-off-by: Xuecong Liao <satorulogic@gmail.com>
Upstream-commit: 6e0f072e36d7b367bde7b5c34fda9c47f36af2da
Component: engine
2014-08-07 15:06:09 +08:00
a223b80846 Merge pull request #6456 from rhatdan/tmpdir
Docker should use /var/lib/docker/tmp for large temporary files.
Upstream-commit: 66c8f87e89ba0dd824cf640a159210fbbb8019ec
Component: engine
2014-08-06 20:31:46 +03:00
44d7ee420c Made requested changes (capitalization)
Upstream-commit: 4d0527856ca4bd0037313f02a3487845af97330e
Component: engine
2014-08-05 19:06:52 -07:00
343e9e6a4a Merge pull request #7412 from bfirsh/rename-docker-config
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
Upstream-commit: 0ea5160d2aff93f49f4288046de4c92727c2e097
Component: engine
2014-08-05 14:52:28 -07:00
05babb14b7 Docker should use /var/lib/container/tmp for large temporary files.
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail.  Also using /tmp potentially allows users on the
system to get access to content, or even attack the content.  Moving the tmpdir to
/var/lib/container/tmp will protect the data.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

Conflicts:
	docker/docker.go
Upstream-commit: b4813f2841638be28208b7b1602f12750a46ece9
Component: engine
2014-08-05 16:43:42 -04:00
6154307ce3 Merge pull request #7349 from knan-linpro/master
networking.md: Networking between containers works without ip_forward
Upstream-commit: e47415d5f5182651c396bd4b4e5277195ee09d08
Component: engine
2014-08-04 23:51:22 -04:00
3b38f1694c Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
DOCKER_CONFIG was introduced in #6984.

We may use "config" for other purposes (e.g. #7232). Until we
have made a design decision around how configuration files will
work, DOCKER_CERT_PATH is a much safer name to rely on for future
compatibility.

Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
Upstream-commit: a49de2c46713149053b0ee25313c6f7a39273c25
Component: engine
2014-08-04 17:36:53 -07:00
98b67bd13a Added "Github Submodules" section to Automated Builds doc.
Signed-off-by: Hollie Teal <hollie.teal@docker.com>
Upstream-commit: bafad8cdc444744069ef005f83bb328c6f8e3b16
Component: engine
2014-08-04 11:12:01 -07:00
88f677f31c Merge pull request #7391 from LK4D4/fix_relative_workdir_example
Fix example of relative WORKDIR
Upstream-commit: d48492a12efa6e31bfcac6adb90f3afae0989fea
Component: engine
2014-08-03 10:14:33 -04:00
7751a70b6e Fix example of relative WORKDIR
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 5514afcd88d40a7a9321a966292e9f724eeafc36
Component: engine
2014-08-03 12:28:25 +04:00
13e82ab047 #1852 Remote API documentation incorrect regarding private registries
Issues addressed:

- Remote API doco refers to "registry" parameter which is not supported
- Neglects to mention "tag" parameter which is supported
- Offers no guidance on pushing to private registries

Changes made:

- As directed in review comments, `registry` removed from all api versions (1.0-1.14)
- Have added documentation for `tag` parameter and guidance on private registries for versions 1.10-1.14 (I have only validated this on .10)

Docker-DCO-1.1-Signed-off-by: Lachlan Coote <lachlan.t.coote@gmail.com> (github: lcoote)
Upstream-commit: a5c5dc121c794daa199a813a95c0affd766a18f4
Component: engine
2014-08-01 15:58:01 -07:00
6c58b89d2d networking.md: Networking between containers works without ip_forward
Docker-DCO-1.1-Signed-off-by: Erik Inge Bolsø <knan@redpill-linpro.com> (github: knan-linpro)
Upstream-commit: e6a084f4f8af3f7a5bc7c2c5ed375eaed61e8b8c
Component: engine
2014-08-01 10:41:16 +02:00
c5e8598f0d Merge pull request #7035 from tianon/standardize-apt-get-install
Standardize "apt-get install" usage across the repo
Upstream-commit: 503d124677f5a0221e1bf8c8ed7320a15c5e01db
Component: engine
2014-08-01 11:43:37 +10:00
c8eb8f3b81 First pass at replacing parent-child metaphor to describe docker links.
Addresses issue #7141

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

a little git by
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: SvenDowideit)
Upstream-commit: 631ea726e425713415e7a991f9a813d02b3f6d75
Component: engine
2014-08-01 11:09:00 +10:00
5fde8856c0 Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
Upstream-commit: ceffc9ea1d9250f6a41d51c6b766dbd98580eeca
Component: engine
2014-07-31 14:43:43 -07:00
2a308976e9 Merge pull request #7327 from ostezer/fix-articles-https
Docs: articles/https minor amendments and update
Upstream-commit: eccc44fad62f8f31a89301ad9f9031fff8bbe661
Component: engine
2014-07-31 14:33:56 -07:00
dfe12ec6ad Merge pull request #7346 from proppy/patch-9
docs/google: bump container-vm image version
Upstream-commit: f77ae9b4f3a71b0a572149561ca29ce9973ff4ab
Component: engine
2014-07-31 17:22:01 -04:00
c795cf8d33 Merge pull request #7193 from hollietealok/doc_remove
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
Upstream-commit: 32fdcaa4192577b629bb622991804f9f9148e823
Component: engine
2014-07-31 15:19:58 -04:00
cf3f6d4b4d Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
Added GA universal analytics support
Upstream-commit: b5ef212ec17932dc159a44f2a77c6e9d4cf4ee9d
Component: engine
2014-07-31 09:00:08 -04:00
c62c248793 Update nodejs_web_app.md
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
Upstream-commit: bfacdfdccf5e93301842309a0048990ef0ebb549
Component: engine
2014-07-31 08:54:22 +02:00
ebf6bae6b0 docs/google: bump container-vm image version
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 294f33b37a2d029164728534e781bc118d6689c2
Component: engine
2014-07-30 22:50:05 -07:00