tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,333 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

47 Commits

Author SHA1 Message Date
Victoria Bialas 6021237a69 fixes broken links in 3 Compose docs files due to topic re-org in PR#23492 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-07-06 16:26:38 -07:00
Sven Dowideit dd3590180d more fixes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-31 21:18:42 +00:00
Jon Lemmon 93901ec480 Rails Docs: Add nodejs to apt-get install command 
When using the latest version of Rails, the tutorial currently errors when running `docker-compose up` with the following error:

```
/usr/local/lib/ruby/gems/2.3.0/gems/bundler-1.11.2/lib/bundler/runtime.rb:80:in `rescue in block (2 levels) in require': There was an error while trying to load the gem 'uglifier'. (Bundler::GemRequireError)
```

Installing nodejs in the build fixes the issue.

Signed-off-by: Jon Lemmon <jon.lemmon@enspiral.com>
 2016-03-28 13:31:40 +13:00
Victoria Bialas e6797e1166 updated Wordpress example to be easier to follow, added/updated images 
docs update per Mary's comments on the PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:59:19 -08:00
Daniel Nephin 471264239f Update guides to use v2 config format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:26 -05:00
Victoria Bialas 8af0a0f85b update to description of files generated from examples, which are no longer owned by root w/new release 
updated descriptions of changing file ownership and images per Seb's comments

fixed line wraps

fixed line breaks per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-16 11:34:59 -08:00
Mary Anthony 3fc72038c5 New navigation for 1.10 release 
Updating with Joffrey's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-27 12:05:56 -08:00
Sebastiaan van Stijn 5ed559fa0e Update links 
Updates some links to their new locations, and
replaces some http:// with https:// links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-21 01:52:54 +01:00
Sven Dowideit acf31181e8 Some small changes to clear up docs-validation complaints 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-19 13:35:09 +10:00
Daniel Nephin 186d43c59f Extract the getting started guide from the index page. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin c7d164d01c Fixes #1843, #1936 - chown files back to host user in django example. 
Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 12:42:15 -04:00
Aanand Prasad 1ed23fb2de Revert networking-related changes to getting started guides 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-16 11:58:27 +05:30
Aanand Prasad d5f5eb1924 Enable use of Docker networking with the --x-networking flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-14 11:19:43 -04:00
Daniel Nephin fbfbe60246 Rename yml.md to compose-file.md and add an alias for the old url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 09:51:34 -04:00
Daniel Nephin e6344f819a Rename yaml reference to compose file reference. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 09:50:37 -04:00
Mary Anthony 0e9c542865 Updating to new tooling:supports Github source linking 
Fixing HEAD
Updating to match daniel
Fixing the index link

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-13 14:04:25 -07:00
mnowster 928300478b Merge pull request #2162 from dnephin/docs_cleanup_and_fixes 
Docs changes, fixed some links, removed older links, etc
 2015-10-13 14:25:33 +01:00
Daniel Nephin cd48a7026a Cleanup doc reference links. 
Removed 'Compose command line completion' and 'Compose environment variables' from the list. command line completion is linked to from install docs, and environment variables are deprecated.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 11:13:24 -04:00
ronen barzel 23fcace36c Bug fix: Use app's Gemfile.lock in Dockerfile 
The Dockerfile should use the same Gemfile.lock as the app, to make sure the container gets the expected versions of gems installed.  Aside from wanting that in principle, without it you can get mysterious gem dependency errors.  Here's the scenario:

1. Suppose `Gemfile` includes `gem "some-active-gem", "~> 1.0"
2. When developing the app, you run `bundle install`, which installs the latest version--let's say, 1.0.1-and records it in `Gemfile.lock`
3. Suppose the developers of `some-active-gem` then release v1.0.2
4. Now build the container: docker runs `bundle install`, which installs v1.0.2 and records it in `Gemfile.lock` and then "ADD"s the app worktree, which replaces the `Gemfile.lock` with the one from the worktree that lists v1.0.1.
5. Immediately run your app and it fails with the error `Could not find some-active-gem-1.0.1 in any of the sources` which is a bit befuddling since you just saw it run bundle install so you expect all gem dependencies to be resolved properly.

Signed-off-by: ronen barzel <ronen@barzel.org>
 2015-10-08 03:08:50 +01:00
Zachary Jaffee fb83b4c6a4 updated wordpress format syntax 
Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
 2015-09-17 09:56:44 -04:00
Daniel Nephin 59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Mary Anthony d454a584da Fixing links after crawl 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-11 09:38:49 -07:00
David BF 1a9ddf645d Remove useless postgres 'port' configuration 
Signed-off-by: David BF <burretfresket@gmail.com>
 2015-07-31 14:40:29 +02:00
Mary Anthony 4ca210edd7 Removing references to boot2docker 
- Replace with machine references
- 1.8 boot2docker is deprecated

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 16:17:46 -07:00
Mary Anthony c26b1c8ee9 Entering fixes from Hugo 
renaming compose-overview back to index
Updating with fixes per Aanand. And others found through test

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-17 21:50:43 -07:00
Mary Anthony e40fc02561 Testing with documentation tooling 
Updating with changes
Updating for Hugo
Adding a README'
moving index.md compose-overview.md in links
changing overview
Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:00:08 -07:00
Ben Firshman 4d745ab87a Link to getting started guides from each page 
These are really hard to find.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-05-12 12:44:43 +01:00
Ben Firshman 08f936b2e7 Fix missing space in rails docs 
From #1031

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-04 10:27:25 +00:00
Fred Lifton 882dc673ce Edits and revisions to Compose Quickstart guides 2015-02-26 18:58:06 -08:00
Sven Dowideit 5b07c581e0 Add an index to the bottom of the Compose docs as they're scattered around docs.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-25 23:38:25 +10:00
Sven Dowideit bd320b19fe add ./script/doc to build fig documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 13:56:13 +10:00
Daniel Nephin 28fa49e569 Merge pull request #810 from madwire/patch-1 
Tweaks to the rails tutorial to bring it inline with rails 4.2 release
 2015-01-27 14:45:31 -05:00
Aanand Prasad 724be54f09 Manual fixes to docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad e3c4a662d9 Find-and-replace on docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Richard Adams 9a90a27376 be explicit with a ruby version number in the Dockerfile 
Signed-off-by: Richard Adams <richard@madwire.co.uk>
 2015-01-07 19:45:00 +00:00
Richard Adams 3b638f0c43 tweaks to the rails tutorial to bring it inline with rail 4.2 release 
Due to a change in Rack, rails server now listens on localhost instead of 0.0.0.0 by default.

Signed-off-by: Richard Adams <richard@madwire.co.uk>
 2015-01-07 17:06:47 +00:00
Aanand Prasad b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01:00
Aanand Prasad 59e31ff544 Update docs to remove numeric suffix 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:08:27 -07:00
Ben Firshman 406425a6b9 Use official images in rails tutorial 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:54:59 -07:00
Ben Firshman 506f54e9c3 Use ruby image for rails docs 
Fixes #376

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 13:42:56 -07:00
Aanand Prasad feb8ad7b4c Update Dockerfile reference/tutorial links 2014-06-16 23:32:50 +01:00
Gary Rennie b06d37f885 Documentation: Include notes on mapping ports 
When mapping ports as strings there is an issue with the way YAML parses
numbers in the format "xx:yy" where yy is less than 60 - this issue is
now included in the documentation.

This fixes #103
 2014-03-03 13:37:15 +00:00
Aanand Prasad c66e18c913 Fix Dockerfile reference URL in docs 2014-03-01 11:28:31 +00:00
Ben Firshman 89d2653662 Add links to Dockerfile docs 2014-01-28 12:46:22 +00:00
Ben Firshman b4cbcbefa6 Remove project name from envvars in docs 2014-01-27 21:12:14 +00:00
Aanand Prasad 40fad23e0b Fix Dockerfile in Rails example 
was missing libpq-dev
 2014-01-27 18:00:47 +00:00
Aanand Prasad 01d0e49a1c New website 2014-01-27 18:00:47 +00:00