Commit Graph

2118 Commits

Author SHA1 Message Date
James Turnbull
dfd6fcb548 Merge pull request #7498 from ostezer/fix-builds-errors
Docs: Fix builds.md line-length + minor typo issues
2014-08-10 13:26:16 -04:00
James Turnbull
7b13212076 Merge pull request #7501 from wyc/patch-1
Update gentoolinux.md
2014-08-10 13:20:14 -04:00
James Turnbull
aa3bc6559b Merge pull request #7514 from phemmer/cli_cmd_prefix_fix
fix command output examples in cli documentation
2014-08-10 13:18:50 -04:00
Patrick Hemmer
d613f11217 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)
2014-08-10 12:47:46 -04:00
wyc
6ba1949e6a Update gentoolinux.md 2014-08-09 14:00:29 -04:00
O.S. Tezer
8b3f2381d0 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)
2014-08-09 14:55:47 +03:00
Hollie Teal
2dc21af70b Merge pull request #7406 from hollietealok/docs_add
Added "Github Submodules" section to Automated Builds doc.
2014-08-08 09:40:42 -07:00
James Turnbull
fb650d1e6d Merge pull request #7465 from flavio/update-opensuse-doc
Updated openSUSE's installation instructions
2014-08-08 11:28:27 -04:00
Flavio Castelli
90e97960fa 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)
2014-08-08 12:36:20 +02:00
James Turnbull
33d6b20c13 Merge pull request #7278 from Toebez/patch-1
Update nodejs_web_app.md
2014-08-07 23:16:37 -04:00
Sven Dowideit
0ca010695c 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
2014-08-08 12:10:01 +10:00
Michael Crosby
414ccee23a Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation
Revert --stop/--kill and use SIGKILL instead
2014-08-07 16:47:25 -07:00
Brian Goff
95f86da641 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)
2014-08-07 18:20:43 -04:00
Brian Goff
3f136dc0e0 Use pure go markdown processor to generate man files
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-08-07 07:06:39 -04:00
satoru
6e0f072e36 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>
2014-08-07 15:06:09 +08:00
unclejack
66c8f87e89 Merge pull request #6456 from rhatdan/tmpdir
Docker should use /var/lib/docker/tmp for large temporary files.
2014-08-06 20:31:46 +03:00
Hollie Teal
4d0527856c Made requested changes (capitalization) 2014-08-05 19:06:52 -07:00
Michael Crosby
0ea5160d2a Merge pull request #7412 from bfirsh/rename-docker-config
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
2014-08-05 14:52:28 -07:00
Dan Walsh
b4813f2841 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
2014-08-05 16:43:42 -04:00
James Turnbull
e47415d5f5 Merge pull request #7349 from knan-linpro/master
networking.md: Networking between containers works without ip_forward
2014-08-04 23:51:22 -04:00
Ben Firshman
a49de2c467 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)
2014-08-04 17:36:53 -07:00
Hollie Teal
bafad8cdc4 Added "Github Submodules" section to Automated Builds doc.
Signed-off-by: Hollie Teal <hollie.teal@docker.com>
2014-08-04 11:12:01 -07:00
James Turnbull
d48492a12e Merge pull request #7391 from LK4D4/fix_relative_workdir_example
Fix example of relative WORKDIR
2014-08-03 10:14:33 -04:00
LK4D4
5514afcd88 Fix example of relative WORKDIR
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-03 12:28:25 +04:00
Lachlan Coote
a5c5dc121c #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)
2014-08-01 15:58:01 -07:00
Erik Inge Bolsø
e6a084f4f8 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)
2014-08-01 10:41:16 +02:00
Sven Dowideit
503d124677 Merge pull request #7035 from tianon/standardize-apt-get-install
Standardize "apt-get install" usage across the repo
2014-08-01 11:43:37 +10:00
Fred Lifton
631ea726e4 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)
2014-08-01 11:09:00 +10:00
Solomon Hykes
ceffc9ea1d Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
2014-07-31 14:43:43 -07:00
Fred Lifton
eccc44fad6 Merge pull request #7327 from ostezer/fix-articles-https
Docs: articles/https minor amendments and update
2014-07-31 14:33:56 -07:00
James Turnbull
f77ae9b4f3 Merge pull request #7346 from proppy/patch-9
docs/google: bump container-vm image version
2014-07-31 17:22:01 -04:00
Aaron Huslage
32fdcaa419 Merge pull request #7193 from hollietealok/doc_remove
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
2014-07-31 15:19:58 -04:00
James Turnbull
b5ef212ec1 Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
Added GA universal analytics support
2014-07-31 09:00:08 -04:00
Jan Toebes
bfacdfdccf Update nodejs_web_app.md
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
2014-07-31 08:54:22 +02:00
Johan Euphrosine
294f33b37a docs/google: bump container-vm image version
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-30 22:50:05 -07:00
Roberto Gandolfo Hashioka
e13b1fc05f Added GA universal analytics support
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
2014-07-30 15:32:14 -07:00
Brian Goff
ba57d3d9e6 Replace old index image with hub
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-07-30 11:15:18 -04:00
O.S. Tezer
711fb3e19d Docs: articles/https minor amendments and update
This commit proposes some minor amendments and updates
for the articles/https.md document to fix certain errors, inc.:

 - Marking commands / flags as code (e.g. `tlsverify`) [done before rebase]
 - Capitalising the word Docker
 - Normalizing headers to match the rest of the docs;
 - Expanding the page description to match the page title and the content;
 - Capitalizing HTTPS etc.;
 - Some spelling error fixes;
 - Line-length adjustments to make it easier to read the raw file.

It does not propose any fundemental changes to the structure of the document.
Certain changes were based before another update on this doc.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-07-30 18:09:58 +03:00
Tibor Vass
b0fb0055d2 Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-30 10:37:52 -04:00
hollietealok
2b9d8248d6 Removed OAuth doc from mkdocs.yml
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
2014-07-29 13:56:19 -07:00
James Turnbull
475131cd4a Merge pull request #6877 from underscorephil/patch-1
Update softlayer.md
2014-07-29 13:20:55 -04:00
James Turnbull
4749b884fe Merge pull request #7256 from jstoja/docs-api-insert-image
Fixing docs - Insert api call
2014-07-29 13:19:22 -04:00
James Turnbull
900d54b48b Merge pull request #7269 from r0n22/patch-1
Update HTTP Proxy Section
2014-07-29 13:15:27 -04:00
Tianon Gravi
fc637b5275 Standardize "apt-get install" usage across the repo
I might have missed some, but I think this is most of the offenders.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-28 17:41:59 -06:00
knappe
331200cbaa Correct Typo In Documentation 2014-07-28 14:39:17 -06:00
Jan Toebes
2519872d77 Update nodejs_web_app.md
The image centos:centos6.4 doesn't exist. Instead you have to choose between the official centos6 or centos7. Both images does not work together with de yum npm install. When choosing an centos6.5 from another distributor (tutum) it works.
2014-07-28 20:43:24 +02:00
r0n22
2095e22121 Update HTTP Proxy Section
Docker.service file location was missing the /usr dir.
2014-07-28 09:39:55 -04:00
Julien Bordellier
2d84b877bd Adding the query parameters to insert api call for all <= 1.10 and
removing the insert documentation for > 1.10 since it has been removed
in 1.11. This commit fixes #7183
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
2014-07-26 13:03:04 +02:00
James Turnbull
1d21f75fa4 Merge pull request #7238 from dericcrago/patch-1
apache2 was looking for two other directories
2014-07-25 19:38:47 -04:00
Andrew Weiss
7a5db6df99 updated article to reflect changes in config; fixed hyperlinks #7243
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
2014-07-25 15:49:33 -04:00