4b845746ef
Merge pull request #2154 from dnephin/publish_master_builds
...
Publish master builds to bintray
2015-10-13 14:50:25 +01:00
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
9b9c8f9cbc
Clarify irc details, and remove "infancy" statement.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
e90d2b418d
Update title for command-line completion docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
182c2537d0
Fix links between reference sections
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
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
6e838b5de1
Add link to master builds from install docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 10:03:44 -04:00
0e9ec8aa74
Add publish to bintray step to appveyor.yml
...
Remove Set-PSDebug -trace to prevent the 9000+ lines of debug output
from spamming the logs on appveyor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 10:02:59 -04:00
94e6727831
Re-order docs Makefile for better caching.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-08 19:12:02 -04:00
5fbde6106e
Merge pull request #2157 from mnowster/2151-missing-port-range
...
Put port ranges back in
2015-10-08 10:22:33 -04:00
a3eb563f94
Put port ranges back in
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-08 11:50:27 +01:00
7538d7d258
Merge pull request #2152 from ronen/patch-1
...
Bug fix: Use app's Gemfile.lock in Dockerfile
2015-10-08 11:14:48 +01:00
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
9ce1884925
Add upload to bintray from travis.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-07 14:54:05 -04:00
7fe2068c9c
Merge pull request #2150 from dnephin/fix_image_name_in_runsh
...
Update release script and run.sh image name
2015-10-07 16:38:45 +01:00
ad96e10938
Add travis.yml for building binaries.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-07 11:07:20 -04:00
34f5912bbc
Update release script and run.sh image name.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-07 11:00:40 -04:00
c8cd618df9
Merge pull request #2145 from dnephin/update_release_scripts
...
Update release scripts for release image
2015-10-07 15:51:04 +01:00
dbe311caaa
Merge pull request #2149 from mnowster/2146-improve-bool-warning-message
...
Improve boolean warning message.
2015-10-07 10:23:58 -04:00
8efc39e616
Improve boolean warning message.
...
Including examples of more boolean types, eg yes/N as it's not
always immediately clear that they are treated as booleans.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 14:59:08 +01:00
627f1acdc4
Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from
...
1188 support ro options in volumes from
2015-10-07 11:57:14 +01:00
60c9225d22
Merge pull request #2140 from dnephin/fix_patch_stdout
...
Reduce the scope of sys.stdout patching
2015-10-07 11:43:25 +01:00
21a1affc63
Re-word docs.
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
f9028703f4
Pick the first container
...
Rather than inefficiently looping through all the containers that a
service has and overriding each volumes_from value, pick the first
one and return that.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
0ff84a78c6
Use multiple returns rather than overriding.
...
Also added a doc string for clarity.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
467c731869
address PR feedback
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
fda615008c
Merge pull request #2142 from dnephin/fix_error_cant_connect
...
Fix error when compose can't connect to docker
2015-10-07 11:22:32 +01:00
4ae2a0e610
Update release scripts for release image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 15:21:34 -04:00
807ab89750
Merge pull request #2144 from dnephin/remove_router_php
...
Remove unnecessary router.php from wordpress example.
2015-10-06 17:25:00 +01:00
97dc4895ac
Remove unnecessary router.php from wordpress example.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 11:37:36 -04:00
02a20c0373
Merge pull request #2069 from dnephin/test_against_latest_version_tags
...
Test against a list of versions generated from docker/docker tags
2015-10-06 16:33:15 +01:00
bf2faf6cdb
Merge pull request #2132 from dnephin/fix_build_against_swarm
...
Fix build against swarm
2015-10-06 16:26:48 +01:00
6edb6fa262
Test against a list of versions generated from docker/docker tags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:51:52 -04:00
15d0c60a73
Fix split buffer with inconsistently delimited json objects.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:43:07 -04:00
3661e8bc74
Fix build against the swarm cluster by joining buffered output before parsing json.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:37:05 -04:00
fe65c0258d
Remove unused attach_socket function from Container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:37:05 -04:00
13d5efcd8b
Merge pull request #2143 from aanand/windows-preparation-instructions
...
Add preparation instructions to Windows build script
2015-10-06 10:13:06 -04:00
5b55a08846
Add support for ro option in volumes_from
...
Fixes #1188
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-06 13:12:55 +01:00
018b1b1c0f
Add preparation instructions to Windows build script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-06 12:57:01 +01:00
fbaea58fc1
Fix #2133 - fix call to get_client()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-05 15:57:49 -04:00
aefb7a44b2
Refactor command class hierarchy to remove an unnecessary intermediate base class Command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-05 15:49:35 -04:00
e230142a25
Reduce the scope of sys.stdout patching.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-03 01:24:28 -04:00
19271898de
Merge pull request #1806 from dnephin/run_script
...
Docker image and bash script for running compose in a container
2015-10-02 17:12:25 +01:00
8616e291c5
Merge pull request #2034 from dnephin/release_scripts
...
Automated release scripts
2015-10-02 16:56:29 +01:00
39cea970b8
alpine docker image for running compose and a script to pull and run it with the
...
correct volumes.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-10-02 11:38:35 -04:00
04375fd566
Restore notes about building non-linux binaries.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:25:16 -04:00
1a2a0dd53d
Fix some bugs in the release scripts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
dc56e4f97e
Update release process docs to use scripts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
da91b81bb8
Add scripts for automating parts of the release.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
6c88640887
Merge pull request #2122 from mnowster/2050-relative-volume-paths-windows
...
2050 ensure windows volume paths are compatible with engine
2015-10-02 16:17:43 +01:00
mnowster
Daniel Nephin
Daniel Nephin
Mazz Mosley
ronen barzel
Aanand Prasad
Vincent Demeester