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
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
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