tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 23:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,251 Commits 21 Branches 282 Tags
Commit Graph

5251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
bb922d63f5 Merge pull request #1318 from aanand/fix-restart-timeout 
Fix --timeout flag on restart, add tests for stop and restart
 2015-04-21 15:07:07 +01:00
Aanand Prasad
2291fa2d45 Fix --timeout flag on restart, add tests for stop and restart 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-21 11:59:33 +01:00
Ben Firshman
3c6652c101 Merge pull request #1308 from aanand/update-docs-1.2.0 
Update docs for 1.2.0
 2015-04-17 10:35:06 -07:00
Aanand Prasad
43af1684c1 Update docs for 1.2.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-17 16:02:57 +01:00
Aanand Prasad
2cdde099fa Merge pull request #1297 from aanand/bump-1.3.0-dev 
Bump 1.3.0dev
 2015-04-16 18:02:59 +01:00
Aanand Prasad
310c7623f9 Bump 1.3.0dev 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-16 17:54:18 +01:00
Aanand Prasad
6e64802545 Merge pull request #1296 from aanand/merge-release-1.2.0 
Merge release 1.2.0
 2015-04-16 17:52:47 +01:00
Aanand Prasad
8b5015c10f Bump 1.2.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-16 17:48:28 +01:00
Aanand Prasad
ed549155b3 Merge pull request #1159 from aanand/bump-1.2.0 
Bump 1.2.0
 2015-04-16 17:46:47 +01:00
Aanand Prasad
39ae91c81c Bump 1.2.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.2.0 		2015-04-16 13:53:27 +01:00
Daniel Nephin
b6acb3cd8c Merge pull request #1278 from albers/completion-run-user 
Add bash completion for docker-compose run --user
(cherry picked from commit 3cd116b99d71f0e0da84e77797392e12070734e1)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-16 13:50:33 +01:00
Michael Chase-Salerno
24a6c240fc Testcase for #1224, check that image or build is specified 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-15 21:38:24 +00:00
Michael Chase-Salerno
15b763acdb Fix for #1224, check that image or build is specified 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-15 02:03:02 +00:00
Daniel Nephin
3cd116b99d Merge pull request #1278 from albers/completion-run-user 
Add bash completion for docker-compose run --user
 2015-04-14 11:04:03 -04:00
Aanand Prasad
b559653c8c Merge pull request #1277 from fredlf/add-help-text 
Adds Where to Get Help section
 2015-04-14 15:16:11 +01:00
Harald Albers
5f17423d3e Add bash completion for docker-compose run --user 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-04-10 19:52:13 +02:00
Fred Lifton
2a442ec6d9 Adds Where to Get Help section 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-04-09 16:23:25 -07:00
Aleksandr Vinokurov
ceff5cb9ca Add parent directories search for default compose-files 
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946.

Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
 2015-04-09 22:36:47 +00:00
Ben Firshman
a467a8a094 Merge pull request #1261 from aanand/fix-vars-in-volume-paths 
Fix vars in volume paths
(cherry picked from commit 4926f8aef629631032327542a56ae35099807005)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	tests/unit/service_test.py
 2015-04-09 15:26:10 +01:00
Ben Firshman
4926f8aef6 Merge pull request #1261 from aanand/fix-vars-in-volume-paths 
Fix vars in volume paths
 2015-04-09 14:44:07 +01:00
Daniel Nephin
927115c3d4 Merge pull request #1271 from sdake/master 
Remove stray print
 2015-04-09 09:41:27 -04:00
Steven Dake
1d7247b67e Remove stray print 
A previous commit introduced a stray print operation.  Remove it.

Signed-off-by: Steven Dake <stdake@cisco.com>
 2015-04-08 12:49:37 -07:00
Ben Firshman
a1cd00e3f0 Merge pull request #1251 from aanand/extends-guide 
Add tutorial and reference for `extends`
 2015-04-08 15:47:39 +01:00
Aanand Prasad
fd568b389d Fix home directory and env expansion in volume paths 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 16:23:45 +01:00
Aanand Prasad
4f95e81c6d Merge pull request #1166 from spk/fix_example_env_file 
Docs: fix env_file example
 2015-04-07 15:52:10 +01:00
Aanand Prasad
619e783a05 Merge pull request #1011 from sdake/master 
Add a --pid=host feature to expose the host PID space to the container
 2015-04-07 13:49:53 +01:00
Aanand Prasad
f3f7f000fe Add tutorial and reference for extends 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 13:46:14 +01:00
Aanand Prasad
219751abc7 Merge pull request #1258 from fredlf/1.6-docs-updates 
Prepping for 1.6 release.
 2015-04-07 11:22:02 +01:00
Joseph Page
0b48e137e8 add unit tests for run --rm with restart 
Signed-off-by: Joseph Page <joseph.page@rednet.io>
 2015-04-07 10:18:25 +02:00
Fred Lifton
947742852e Prepping for 1.6 release. 
Adds release notes and edits/revises new Compose in production doc.
 2015-04-06 16:47:07 -07:00
Steven Dake
94277a3eb0 Add --pid=host support 
Allow docker-compsoe to use the docker --pid=host API available in 1.17

Signed-off-by: Steven Dake <stdake@cisco.com>
 2015-04-06 12:44:35 -07:00
Steven Dake
11a2100d53 Add a --pid=host feature to expose the host PID space to the container 
Docker 1.5.0+ introduces a --pid=host feature which allows sharing of PID
namespaces between baremetal and containers.  This is useful for atomic
upgrades, atomic rollbacks, and monitoring.

For more details of a real-life use case, check out:
http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/

Signed-off-by: Steven Dake <stdake@cisco.com>
 2015-04-06 11:45:37 -07:00
Fred Lifton
530d7af5cf Merge pull request #1253 from aanand/production-guide 
Add guide to using Compose in production
 2015-04-06 10:49:49 -07:00
Aanand Prasad
502d58abe6 Add guide to using Compose in production 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-03 18:56:29 -04:00
Fred Lifton
eb073c53f4 Merge pull request #1249 from asveepay/update_doc 
Update install docs for permission denied error
 2015-04-03 12:31:38 -07:00
Roland Cooper
d866415b9a Update install docs for permission denied error 
Signed-off-by: Roland Cooper <rcooper@enova.com>
 2015-04-03 12:21:15 -05:00
Aanand Prasad
dd40658f87 Merge pull request #1238 from aanand/use-docker-1.6-rc3 
Use Docker 1.6 RC3
 2015-04-03 13:00:49 -04:00
Aanand Prasad
b3382ffd4f Use Docker 1.6 RC4 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-03 10:57:28 -04:00
Aanand Prasad
15a0fac939 Merge pull request #1141 from bfirsh/contributing-section-in-readme 
Add contributing section to readme
 2015-04-03 10:56:06 -04:00
Aanand Prasad
78227c3c06 Merge pull request #1202 from aanand/jenkins-script 
WIP: Jenkins script
(cherry picked from commit 853ce255eac5375562e399d3e105dc5a456dbb99)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-01 11:00:51 -04:00
Daniel Nephin
e4e802d1f8 Merge pull request #1213 from moysesb/relative_build 
Make value of 'build:' relative to the yml file.
(cherry picked from commit 0f70b8638ff7167e9755d24dc8dab1579662f72d)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-01 11:00:48 -04:00
Aanand Prasad
b24a60ba9f Merge pull request #1226 from aanand/merge-multi-value-options 
Merge multi-value options when extending
(cherry picked from commit e708f4f59dcb417e90a5bbdcadcee37e8c6b7802)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-01 11:00:45 -04:00
Aanand Prasad
461b600068 Merge pull request #1225 from aanand/fix-1222 
When extending, `build` replaces `image` and vice versa
(cherry picked from commit 6dbe321a45dfd7539234f889825b54e1a026e46f)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-01 11:00:40 -04:00
Laurent Arnoud
e3cff5d17d Docs: fix env_file example 
Thanks-to: @aanand
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
 2015-04-01 11:15:09 +02:00
Daniel Nephin
0f70b8638f Merge pull request #1213 from moysesb/relative_build 
Make value of 'build:' relative to the yml file.
 2015-03-31 21:20:02 -04:00
Moysés Borges
8584525e8d Interpret 'build:' as relative to the yml file 
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.

* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)

Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
 2015-03-31 18:47:26 -03:00
Aanand Prasad
e3e2247159 Merge pull request #1231 from aanand/docker-1.6rc2 
Test against Docker 1.6 RC2 only
 2015-03-31 16:31:03 -04:00
Aanand Prasad
0650c4485a Test against Docker 1.6 RC2 only 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 16:04:22 -04:00
Aanand Prasad
e708f4f59d Merge pull request #1226 from aanand/merge-multi-value-options 
Merge multi-value options when extending
 2015-03-31 16:01:22 -04:00
Aanand Prasad
907918b492 Merge multi-value options when extending 
Closes #1143.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 15:30:59 -04:00