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