c72d62f96d
Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images
...
Update wordpress example to use official images
2016-04-01 20:53:37 +01:00
a63a05964b
Merge pull request #3249 from aanand/better-env-substitution-example
...
Better variable substitution example
2016-04-01 15:12:18 -04:00
9509508f3e
Merge pull request #3226 from shin-/3210-assert-hostname
...
Fix assert_hostname logic in tls_config_from_options
2016-04-01 10:32:13 -07:00
1a7a65f84d
Include docker-py requirements fix
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-31 18:01:51 -07:00
3034803258
Better variable substitution example
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-31 15:45:14 +01:00
78a8be07ad
Re-enabling assert_hostname when instantiating docker_client from the
...
environment.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:11:19 -07:00
d27b82207c
Remove obsolete assert_hostname tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 10:58:15 -07:00
71c86acaa4
Update docker-py version to include match_hostname fix
...
Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 18:01:27 -07:00
85e2fb63b3
Merge pull request #3218 from sdurrheimer/zsh-completion-run-workdir
...
Add zsh completion for 'docker-compose run -w --workdir'
2016-03-29 16:50:12 +01:00
024a810617
Merge pull request #3217 from sdurrheimer/zsh-completion-up-build
...
Add zsh completion for 'docker-compose up --build'
2016-03-29 16:49:49 +01:00
668d45c7cc
Merge pull request #3216 from sdurrheimer/zsh-completion-logs
...
Add zsh completion for 'docker-compose logs -f --follow --tail -t --t…
2016-03-29 16:49:36 +01:00
09ea74245d
Merge pull request #3215 from sdurrheimer/zsh-completion-exec-command
...
Add zsh completion for 'docker-compose exec' command
2016-03-29 16:49:15 +01:00
386edd892c
Merge pull request #3214 from sdurrheimer/zsh-completion-rm-all
...
Add zsh completion for 'docker-compose rm -a --all'
2016-03-29 16:48:53 +01:00
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-28 17:39:20 -07:00
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
8ae8f7ed4b
Add zsh completion for 'docker-compose run -w --workdir'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-03-25 19:25:33 +01:00
9729c0d3c7
Add zsh completion for 'docker-compose up --build'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-03-25 19:15:34 +01:00
9d58b19ecc
Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-03-25 19:09:53 +01:00
63b448120a
Add zsh completion for 'docker-compose exec' command
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-03-25 19:03:36 +01:00
0f1fb42326
Add zsh completion for 'docker-compose rm -a --all'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-03-25 18:52:28 +01:00
aa50023507
Merge pull request #3057 from shin-/2636-env-file
...
Add support for a default environment file
2016-03-24 14:26:03 -04:00
12ad3ff301
Injecting os.environ in Environment instance happens outside of init method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
1506f997de
Better windows support for Environment class
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
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
c7afe16419
Account for case-insensitive env on windows platform
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
36f1b4589c
Limit occurrences of creating an environment object.
...
.env file is always read from the project_dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
0ff53d9668
Less verbose environment invocation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
dcdcf4869b
Mention environment file in envvars.md
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
21aa7a0448
Documentation for .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
f48da96e8b
Test get_project_name from env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
d55fc85fea
Added default env file test.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
1801f83bb8
Environment class cleanup
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
fd020ed2cf
Tests use updated get_config_paths_from_options signature
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
5831b869e8
Update tests for new environment handling
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
b9ca5188a2
Remove Environment singleton, instead carry instance during config processing
...
Project name and compose file detection also updated
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
bf8e501b5e
Fix pre-commit config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c69d8a3bd2
Implement environment singleton to be accessed throughout the code
...
Load and parse environment file from working dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
d1d8df7f72
Merge pull request #3192 from shin-/use-dockerpy-1.8
...
Require docker-py 1.8.0rc2
2016-03-24 13:55:59 -04:00
d78b013bb0
Merge pull request #3204 from albers/completion-rm--all
...
bash completion for `docker-compose rm --all`
2016-03-24 10:44:36 -07:00
aabeb56527
Merge pull request #3206 from albers/completion-exec
...
bash completion for `docker-compose exec`
2016-03-24 10:44:19 -07:00
60470fb9f1
Require docker-py 1.8.0rc2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:13:56 -07:00
84a2e634a8
Merge pull request #3200 from dnephin/disable_broken_test
...
Disable a test that is failing against 1.11.0rc1.
2016-03-24 13:09:35 -04:00
c9b02b7b34
bash completion for `docker-compose exec`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 18:02:12 +01:00
87231a25be
Merge pull request #3202 from albers/completion-logs
...
bash completion for new `docker logs` options
2016-03-24 09:56:12 -07:00
353c4deb19
Merge pull request #3203 from albers/completion-up--build
...
bash completion for `docker-compose up --build`
2016-03-24 09:55:58 -07:00
732531b722
Disable a test that is failing against 1.11.0rc1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-24 12:32:13 -04:00
b030c3928a
bash completion for `docker-compose rm --all`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 17:29:04 +01:00
5416e4c99b
bash completion for `docker-compose up --build`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 17:21:56 +01:00
d8fb9d8831
bash completion for new `docker logs` options
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 17:11:10 +01:00
2b063d332e
Merge pull request #3196 from albers/completion-daemon-options
...
bash completion for new TLS options
2016-03-24 15:11:55 +00:00
Ben Firshman
Daniel Nephin
Joffrey F
Joffrey F
Aanand Prasad
Jon Lemmon
Steve Durrheimer
Harald Albers
Daniel Nephin