docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
44,210 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

945 Commits

Author SHA1 Message Date
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-11-01 17:01:41 -07:00
Victoria Bialas 980956ef9d incorporated misty's comments 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-31 12:43:52 -07:00
michael-wise 870abe59b4 added a filename above the custom script 
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
 2016-10-26 21:24:36 -04:00
Victoria Bialas 9c5319211d Fixing note formatting 
Changing note format back to the way it was to match the rest of the notes in this section.
 2016-10-26 16:58:24 -07:00
Victoria Bialas 568cded2a5 finishing touches on Wordpress example in Compose docs per pr#129 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-26 13:46:53 -07:00
John Mulhausen be3e860fa1 Merge pull request #328 from alexandair/patch-1 
Update index.md
 2016-10-25 14:25:52 -07:00
Victoria Bialas 7fd5e20337 Update ps.md 2016-10-25 11:38:33 -07:00
Victoria Bialas e65a98ef9f Update install.md 2016-10-25 11:24:45 -07:00
Victoria Bialas 50d7898fe4 Update gettingstarted.md 2016-10-25 11:22:30 -07:00
Victoria Bialas 100a82043a Update gettingstarted.md 2016-10-25 11:18:39 -07:00
dave-pollock 1967bd2603 Update swarm.md 
Scheduling filters should be configured in the environment section of compose files - NOT labels.
 2016-10-25 14:57:00 +01:00
Markus Schulte 1de1d10073 At paragraph "links", fixed anchor-link to "depends-on" 2016-10-24 12:01:00 +02:00
Aleksandar Nikolić 18499881e5 Update index.md 
Fix typo.
 2016-10-23 20:12:47 +02:00
Joao Fernandes bce5d70ce6 Updates compose install to 1.8.1 
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
 2016-10-19 15:57:43 -07:00
DavidRabel-b1 673523ee9a Update django.md 
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .

See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
 2016-10-19 17:07:49 +02:00
John Mulhausen 5d9e15dcad Merge pull request #174 from IRus/patch-1 
This guide used legacy backticks.
 2016-10-18 16:35:17 -07:00
John Mulhausen 83ec5da00d Merge pull request #196 from ezeeetm/patch-1 
update 'environment' to 'labels'
 2016-10-18 16:13:16 -07:00
Ivan Perez 3c41a34fd6 Typo in cd command 
Fixes typo in command.

(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
 2016-10-18 20:44:36 +02:00
LRubin 3129564e3d Merge pull request #251 from liubin/master 
remove redundant back slash
 2016-10-18 11:37:04 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Bin Liu c8b449e7e0 remove redundant back slash 
I think this is a redundant back slash, should be removed.
 2016-10-18 22:31:25 +08:00
ezeeetm 91b9a38864 update 'environment' to 'labels' 
according to @aanandPrasad
constraining containers in swarm with compose is now done with 'labels' as of Swarm 0.3 and Compose 1.3

https://groups.google.com/forum/#!topic/docker-dev/Uzcies21qPo
 2016-10-13 14:40:17 -07:00
nVitius bb7661a926 Document Compose's syntax for variable defaults 
This feature was not supported previously, but
was added in https://github.com/docker/compose/pull/3108
 2016-10-12 09:50:40 -07:00
Ibragimov Ruslan 0778af3d17 This guide used legacy backticks. 
https://github.com/koalaman/shellcheck/wiki/SC2006
https://github.com/koalaman/shellcheck/wiki/SC2046
 2016-10-12 14:19:24 +03:00
BSCheshir c98a6d8902 example pls 2016-10-08 23:35:37 +04:00
John Mulhausen 8ea375e1d7 Fix for list in compose-file, CSS fixes for blockquotes 2016-10-07 13:48:23 -07:00
BSCheshir 1b8729c5be remove prefix space 
strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/

but github clear it on preview .md
 2016-10-07 23:18:45 +04:00
sixcorners 9a2be62bf8 Update compose-file.md 
Document that the journald logging driver allows docker-compose logs to work.
 2016-10-05 11:40:42 -05:00
John Mulhausen 0133cb646d Merge pull request #21 from pborreli/typos 
Fixed typos
 2016-09-30 11:51:42 -07:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen 0ad083ff1f Delete Makefile 2016-09-29 23:40:58 -07:00
John Mulhausen d8b7717467 Delete Dockerfile 2016-09-29 23:40:48 -07:00
John Mulhausen 99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
Pascal Borreli 6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 9f31bb790d Put back inadvertently deleted compose directory 2016-09-29 12:13:47 -07:00
Misty Stanley-Jones 701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones 7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00
Joffrey F f3628c7a5e Bump 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 11:57:23 -07:00
Aanand Prasad e115eaf6fc Fix error message for unrecognised TLS version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 11:57:23 -07:00
Aanand Prasad cefa239c2e Bump 1.8.0-rc3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 17:46:13 +01:00
Aanand Prasad 35ed189981 Copy experimental bundle docs into Compose docs so URL is stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad c392acc56b Show a warning when engine is in swarm mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Ben Firshman cd267d5121 Add user agent to API calls 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 16:27:05 +01:00
Ben Firshman cb076a57b9 Suggest to run Docker for Mac if it isn't running 
Instead of suggesting docker-machine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 0488dd3709 Rename --fetch-digests to --push-images and remove auto-pull 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad b72f911ccf Fix timeout value in error message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad f9c5816ab8 Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 2ecbf25445 Fix bugs with entrypoint/command in docker-compose run 
- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Tomas Tomecek e1b7510e4a service: detailed error messages for create and start 
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad c72c966abc Bump 1.8.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 18:05:11 -07:00
Aanand Prasad 217f762a60 Post-merge fix - restore Environment import in main.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Joffrey F 70da16103a Unset env vars behavior in 'run' mirroring engine 
Unset env vars passed to `run` via command line options take the
value of the system's var with the same name.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-06 16:20:17 -07:00
Aanand Prasad 72849d99c0 Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:17 -07:00
Daniel Nephin a7fc3e2220 Add an acceptance test for bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:16 -07:00
Daniel Nephin db02c9f537 Add some unit tests for new bundle and push commands. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad 33cc601176 Warn on missing digests, don't push/pull by default 
Add a --fetch-digests flag to automatically push/pull

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:16 -07:00
Joffrey F 9bf6bc6dbd Bump 1.8.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-14 12:35:46 -07:00
Joffrey F 0fe82614a6 Merge pull request #3595 from dnephin/add-push-and-bundle 
Add docker-compose push and docker-compose bundle
 2016-06-14 10:57:32 -07:00
Aanand Prasad 8f8c17bf66 Merge pull request #3549 from shin-/KalleDK-master 
Add support for COMPOSE_TLS_VERSION config option
 2016-06-14 10:57:12 -07:00
Daniel Nephin 9b7bd69cfc Support entrypoint, labels, and user in the bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-14 13:00:12 -04:00
Aanand Prasad 1ea9dda1d3 Implement 'docker-compose push' and 'docker-compose bundle' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-14 12:06:14 -04:00
Aanand Prasad 21f20cbc9b Merge pull request #3449 from Andrey9kin/ready/3281 
Fix #3281: Unexpected result when using build args with default values
 2016-06-14 08:05:07 -07:00
Aanand Prasad 2123906586 Merge pull request #3577 from sanmai-NL/3576-byte_str_fix 
Fix byte/str typing error
 2016-06-14 01:58:27 +01:00
Joffrey F 60f7e021ad Fix split_path_mapping behavior when mounting "/" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-13 15:32:10 -07:00
Sander Maijers 61324ef308
Fix byte/str typing error 
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
 2016-06-10 16:30:46 +02:00
Aanand Prasad e502417df2 Merge pull request #3475 from shin-/3429-networks-config-serialize 
Output valid config in config command
 2016-06-07 18:01:39 +02:00
Joffrey F ea640f3821 Remove external_name from serialized config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-03 12:10:09 -07:00
Joffrey F e7a8b2fed5 Update TLS version configuration code. Tests. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-03 11:45:22 -07:00
Andrey Devyatkin a67ba5536d Fix #3281: Unexpected result when using build args with default values 
Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
  .... args:
  - http_proxy
  - https_proxy
  - no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
 2016-05-28 11:39:41 +02:00
Andrey Devyatkin c148849f0e Fix #3281: Unexpected result when using build args with default values 
Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
 2016-05-27 20:16:52 +02:00
Andrey Devyatkin e3e8a619cc Fix #3281: Unexpected result when using build args with default values 
Fix the issue when build arg is set to None instead of empty string.
Usecase:

cat docker-compose.yml
....
args:
- http_proxy
- https_proxy
- no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined
then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change build args will not passed to docker engine if they are equal to string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
 2016-05-27 07:48:13 +02:00
Joffrey F c4229b469a Improve merging for several service config attributes 
All uniqueItems lists in the config now receive the same treatment removing
duplicates.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-20 15:29:04 -07:00
Joffrey F 842e372258 Eliminate duplicates when merging port mappings from config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-20 15:28:35 -07:00
Aanand Prasad 7763122ecb Merge pull request #3459 from shin-/2487-split-volume-path 
Always use the Windows version of splitdrive when parsing volume mappings
 2016-05-20 11:42:43 +01:00
Joffrey F 9a39208741 Merge pull request #3482 from aanand/fix-prompt-buffering 
Fix bug where confirmation prompt doesn't show due to line buffering
 2016-05-19 08:52:34 -07:00
Aanand Prasad 0c8aeb9e05 Fix bug where confirmation prompt doesn't show due to line buffering 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-19 15:44:17 +01:00
Joffrey F db0a6cf2bb Always use the Windows version of splitdrive when parsing volume mappings 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-17 16:33:59 -07:00
Joffrey F 844b7d463f Update rm command to always remove one-off containers. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-16 14:59:33 -07:00
Joffrey F e5645595e3 Fail gracefully when -d is not provided for exec command on Win32 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-12 14:00:54 -07:00
Aanand Prasad 72f6a5c8d3 Merge pull request #3433 from anton44eg/issue_3432 
add msg attribute to ProjectError class
 2016-05-12 16:55:11 +01:00
Joffrey F dc88e54010 Merge pull request #3399 from yorkedork/fix/env-file-validation 
Adds additional validation to 'env_vars_from_file'.
 2016-05-12 08:53:25 -07:00
Anton Simernia 4b01f6dcd6 add msg attribute to ProjectError class 
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
 2016-05-09 18:26:20 +07:00
Joffrey F 310b3d9441 Properly handle APIError failures in Project.up 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-02 13:42:05 -07:00
Thom Linton 28fb91b344 Adds additional validation to 'env_vars_from_file'. 
The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.

This change adds an additional validation to allow the use of this
path provided it is not a file.

Signed-off-by: Thom Linton <thom.linton@gmail.com>
 2016-04-29 17:53:31 -07:00
Joffrey F fe17e0f948 Skip event objects that don't contain a status field 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-29 16:39:42 -07:00
Joffrey F bd7ec24e25 Merge pull request #3384 from shin-/3264-shorthand-host-support 
Support combination of shorthand flag and equal sign for host option
 2016-04-29 16:39:16 -07:00
Joffrey F 8cc7d68a00 Merge pull request #3390 from aronahl/master 
Add missing log event filter when using docker-compose logs.
 2016-04-28 12:53:04 -07:00
Joffrey F 0b24883cef Support combination of shorthand flag and equal sign for host option 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-28 12:52:00 -07:00
Aaron Nall 2efcec776c Add missing log event filter when using docker-compose logs. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2016-04-28 15:14:44 +00:00
Daniel Nephin 61794ba97c Merge pull request #3377 from shin-/3372-windowserror 
Define WindowsError on non-win32 platforms
 2016-04-28 10:33:18 -04:00
Joffrey F d3e645488a Define WindowsError on non-win32 platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-26 11:40:31 -07:00
Aanand Prasad 756ef14edc Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-26 19:21:03 +01:00
Aanand Prasad 6064d200f9 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-26 19:21:03 +01:00
Ben Firshman b67f110620 Explain the explanation about file versions 
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-20 16:40:16 -07:00
Ben Firshman 27628f8655 Make validation error less robotic 
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"

is now:

"ERROR: The Compose file './docker-compose.yml' is invalid because:"

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-20 16:38:09 -07:00
Aanand Prasad cafe1315b2 Merge pull request #3334 from werehuman/fix-config-hash-change 
Fix #3248: Accidental config_hash change
 2016-04-19 12:42:19 +01:00
Aanand Prasad 984f839d33 Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature 
Added code to support no argument help command
 2016-04-19 12:14:24 +01:00
Aanand Prasad d21e1c5a30 Merge pull request #3335 from johnharris85/master 
Fix CLI docstring to reflect Docopt behaviour.
 2016-04-19 12:13:20 +01:00
Aanand Prasad 52fa010ac7 Merge pull request #3337 from dnephin/check_for_short_id_alias 
Check for short id alias, and don't disconnect if it already exists
 2016-04-19 12:12:43 +01:00