jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3,170 commits 9 branches 77 tags 9.3 MiB
Commit graph

547 commits

Author SHA1 Message Date
Sven Dowideit
05083b690c Merge pull request #3092 from wenchma/service_image 
Update image format for service conf reference
(cherry picked from commit f1603a3ee2)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:42:03 +00:00
Sven Dowideit
c4f1bec924 Merge pull request #3417 from spectralsun/patch-1 
Small typo
(cherry picked from commit 5fa81c4044)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:41:52 +00:00
Sven Dowideit
3a0b175593 Merge pull request #3392 from SvenDowideit/use-docs-base-oss 
convert docs Dockerfiles to use docs/base:oss
(cherry picked from commit c1c8c70800)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:41:29 +00:00
Daniel Nephin
2246e8bfbe Merge pull request #3359 from bfirsh/clarify-compose-file-networks-documentation 
Clarify service networks documentation
(cherry picked from commit 1988dfeaf0)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:39:03 +00:00
Ben Firshman
c7ef84a0ce Merge pull request #3222 from jonlemmon/patch-1 
Rails Docs: Add nodejs to apt-get install command
(cherry picked from commit 6ff3c47630)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:38:21 +00:00
Aanand Prasad
174afeb974 Merge pull request #3303 from aanand/clarify-rm-and-down 
Clarify behaviour of rm and down
(cherry picked from commit 3d3f331404)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:37:27 +00:00
Victoria
1523711e89 Merge pull request #3295 from londoncalling/docs-format-followup-PR3275 
added some formatting on the Wordress steps, and made heading levels …
(cherry picked from commit 97467c7dec)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:36:23 +00:00
Victoria
b632ccba7f Merge pull request #3275 from activatedgeek/patch-1 
Updated Wordpress tutorial
(cherry picked from commit 80614cff9b)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:36:09 +00:00
Ben Firshman
dad0dd664d Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images 
Update wordpress example to use official images
(cherry picked from commit c72d62f96d)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:35:05 +00:00
Daniel Nephin
e15c2d53df Merge pull request #3249 from aanand/better-env-substitution-example 
Better variable substitution example
(cherry picked from commit a63a05964b)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:34:17 +00:00
Joffrey F
0a9ab358bf Bump 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
André R
6bfdde6855 Clarify env-file doc that .env is read from cwd 
Closes #3381

Signed-off-by: André R <ar@ez.no>
 2016-05-04 11:52:57 -07:00
Daniel Nephin
1ad88662c0 Bump 1.7.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-24 14:31:37 -04:00
Joffrey F
b99037b4a6 Add support for DOCKER_* variables in .env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F
0ff53d9668 Less verbose environment invocation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F
dcdcf4869b Mention environment file in envvars.md 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F
21aa7a0448 Documentation for .env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Aanand Prasad
8282bb1b24 Add TLS flags to CLI reference 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-24 14:41:51 +00:00
Victoria
2a09fb02db Merge pull request #3182 from londoncalling/docs-fix-links-build-errors 
fixed links showing as build errors per PR #3180
 2016-03-23 15:08:25 -07:00
Victoria Bialas
d1ea4d72ac fixed links showing as build errors per PR #3180 
fixed links per build errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-03-23 14:58:45 -07:00
Aanand Prasad
a20b84e6d2 Merge pull request #3178 from aanand/2774-off-one-offs 
Remove one-off containers in `rm` and `down`
 2016-03-22 10:12:21 +00:00
Joffrey F
187ea4cd81 Add --all option to rm command - remove one-off containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Philip Walls
85c7d3e5ce Add support for docker run --tmpfs flag. 
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
 2016-03-18 18:19:48 -04:00
Aanand Prasad
50fe014ba9 Remove hardcoded host from Engine install URLs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 18:10:32 +00:00
Aanand Prasad
10dfd54ebe Update install page with link to Windows Toolbox install instructions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 18:09:38 +00:00
Aanand Prasad
7424938fc8 Move ipv4_address/ipv6_address docs to reference section 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 11:32:36 +00:00
Joffrey F
dd40331b44 Merge pull request #3102 from shin-/1477-a-modest-proposal 
Add flag to up/down to remove orphaned containers
 2016-03-16 10:58:15 -07:00
Joffrey F
20c29f7e47 Add flag to up/down to remove orphaned containers 
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-15 16:11:49 -07:00
Simon van der Veldt
658803edf8 Add -w or --workdir to compose run to override workdir from commandline 
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2016-03-15 15:28:32 -04:00
Aanand Prasad
9853b876af Merge pull request #3101 from bfirsh/less-scary-swarm-compose-docs 
Better Compose in production docs
 2016-03-14 16:12:46 +00:00
Ben Firshman
1485a56c75 Better Compose in production docs 
The Compose/Swarm integration has been working really well for
users, so it seems pretty safe to remove the scary warnings about
it not being ready.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-03-10 08:55:07 -08:00
Matt Daue
ee136446a2 Fix #2804: Add ipv4 and ipv6 static addressing 
- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests

Signed-off-by: Matt Daue <mattdaue@gmail.com>
 2016-03-09 18:37:52 -05:00
Joffrey F
7a30fc0983 Merge pull request #3089 from ltiao/patch-1 
Fixed indentation level in example.
 2016-03-09 10:56:50 -08:00
Aanand Prasad
e700d7ca6a Fix version in docs example 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-08 18:15:18 +01:00
Louis Tiao
88a719b4b6 Fixed indentation level in example. 
Signed-off-by: Louis Tiao <louistiao@gmail.com>
 2016-03-08 15:53:55 +11:00
Daniel Nephin
53a3d14046 Support multiple files in COMPOSE_FILE env var. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 18:47:58 -05:00
Aanand Prasad
1655be6c5b Merge pull request #2601 from dnephin/dont_build_on_up 
Only build as part of `up` if `--build` flag is set
 2016-03-02 15:02:18 -08:00
Daniel Nephin
e1b87d7be0 Update reference docs for the new flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Aanand Prasad
3f3c05e465 Merge pull request #3049 from aanand/clarify-depends-on 
Clarify depends_on logic
 2016-03-02 11:59:06 -08:00
Aanand Prasad
aa7b862f4c Clarify depends_on logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 10:29:24 -08:00
Aanand Prasad
0b3561a7d5 Merge pull request #2720 from seguins/2227-improvements-logs 
Add flags on logs
 2016-03-01 17:41:31 -08:00
Stéphane Seguin
9b36dc5c54 Add --tail flag as option on logs. 
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin
d9b4286f91 Add -t, --timestamps flag as option on logs. 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin
82632098a3 Add -f, --follow flag as option on logs. 
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:43 +01:00
Aanand Prasad
7684604830 Merge pull request #3023 from londoncalling/fix-note-3019 
WIP: updated note format for dockerfile per Aanand's comments on PR #…
 2016-03-01 11:11:55 -08:00
Aanand Prasad
fc99c7ee19 Merge pull request #2584 from mjgpy3/patch-1 
Update `volumes_from` docs to state default
 2016-02-29 15:37:46 -08:00
Daniel Nephin
f5ce31d43e Merge pull request #3024 from aanand/update-build-image-docs 
Update docs about using build and image together
 2016-02-29 14:03:54 -08:00
Daniel Nephin
4db1fef58c Merge pull request #3022 from aanand/update-build-image-extends-note 
Update note about build + image with extends
 2016-02-29 14:03:28 -08:00
Daniel Nephin
8d24af92e0 Merge pull request #3030 from aanand/document-startup-order-workarounds 
Document ways to make services wait for dependencies
 2016-02-29 13:01:32 -08:00
Aanand Prasad
6b947ee478 Document ways to make services wait for dependencies 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-29 11:24:58 -08:00