compose

jyapayne/compose

Fork 0

Commit graph

3cd116b99d Merge pull request #1278 from albers/completion-run-user Daniel Nephin 2015-04-14 11:04:03 -04:00
b559653c8c Merge pull request #1277 from fredlf/add-help-text Aanand Prasad 2015-04-14 15:16:11 +01:00
5f17423d3e Add bash completion for docker-compose run --user Harald Albers 2015-04-10 19:51:45 +02:00
2a442ec6d9 Adds Where to Get Help section Fred Lifton 2015-04-09 16:23:25 -07:00
ceff5cb9ca Add parent directories search for default compose-files Aleksandr Vinokurov 2015-03-31 20:21:04 +00:00
b3f23e2d17 Bump 1.2.0 1.2.0rc4 Aanand Prasad 2015-03-23 10:40:23 -07:00
a467a8a094 Merge pull request #1261 from aanand/fix-vars-in-volume-paths Ben Firshman 2015-04-09 14:44:07 +01:00
4926f8aef6 Merge pull request #1261 from aanand/fix-vars-in-volume-paths Ben Firshman 2015-04-09 14:44:07 +01:00
927115c3d4 Merge pull request #1271 from sdake/master Daniel Nephin 2015-04-09 09:41:27 -04:00
1d7247b67e Remove stray print Steven Dake 2015-04-08 12:49:37 -07:00
a1cd00e3f0 Merge pull request #1251 from aanand/extends-guide Ben Firshman 2015-04-08 15:47:39 +01:00
fd568b389d Fix home directory and env expansion in volume paths Aanand Prasad 2015-04-07 12:59:47 +01:00
4f95e81c6d Merge pull request #1166 from spk/fix_example_env_file Aanand Prasad 2015-04-07 15:52:10 +01:00
619e783a05 Merge pull request #1011 from sdake/master Aanand Prasad 2015-04-07 13:49:53 +01:00
f3f7f000fe Add tutorial and reference for extends Aanand Prasad 2015-04-03 16:31:12 -04:00
219751abc7 Merge pull request #1258 from fredlf/1.6-docs-updates Aanand Prasad 2015-04-07 11:22:02 +01:00
0b48e137e8 add unit tests for run --rm with restart Joseph Page 2015-04-07 10:11:36 +02:00
947742852e Prepping for 1.6 release. Adds release notes and edits/revises new Compose in production doc. Fred Lifton 2015-04-06 16:47:07 -07:00
94277a3eb0 Add --pid=host support Steven Dake 2015-02-24 22:42:23 -07:00
11a2100d53 Add a --pid=host feature to expose the host PID space to the container Steven Dake 2015-02-24 06:39:06 -07:00
530d7af5cf Merge pull request #1253 from aanand/production-guide Fred Lifton 2015-04-06 10:49:49 -07:00
502d58abe6 Add guide to using Compose in production Aanand Prasad 2015-04-03 18:26:02 -04:00
eb073c53f4 Merge pull request #1249 from asveepay/update_doc Fred Lifton 2015-04-03 12:31:38 -07:00
d866415b9a Update install docs for permission denied error Roland Cooper 2015-03-26 19:17:36 -05:00
dd40658f87 Merge pull request #1238 from aanand/use-docker-1.6-rc3 Aanand Prasad 2015-04-03 13:00:49 -04:00
b3382ffd4f Use Docker 1.6 RC4 Aanand Prasad 2015-04-01 14:59:21 -04:00
15a0fac939 Merge pull request #1141 from bfirsh/contributing-section-in-readme Aanand Prasad 2015-04-03 10:56:06 -04:00
f69de1166f Bump 1.2.0 1.2.0rc3 Aanand Prasad 2015-03-23 10:40:23 -07:00
78227c3c06 Merge pull request #1202 from aanand/jenkins-script Aanand Prasad 2015-03-27 14:59:49 -07:00
e4e802d1f8 Merge pull request #1213 from moysesb/relative_build Daniel Nephin 2015-03-31 21:20:02 -04:00
b24a60ba9f Merge pull request #1226 from aanand/merge-multi-value-options Aanand Prasad 2015-03-31 16:01:22 -04:00
461b600068 Merge pull request #1225 from aanand/fix-1222 Aanand Prasad 2015-03-31 15:23:34 -04:00
e3cff5d17d Docs: fix env_file example Laurent Arnoud 2015-03-24 15:22:11 +01:00
0f70b8638f Merge pull request #1213 from moysesb/relative_build Daniel Nephin 2015-03-31 21:20:02 -04:00
8584525e8d Interpret 'build:' as relative to the yml file Moysés Borges 2015-03-29 17:06:35 -03:00
e3e2247159 Merge pull request #1231 from aanand/docker-1.6rc2 Aanand Prasad 2015-03-31 16:31:03 -04:00
0650c4485a Test against Docker 1.6 RC2 only Aanand Prasad 2015-03-31 16:04:22 -04:00
e708f4f59d Merge pull request #1226 from aanand/merge-multi-value-options Aanand Prasad 2015-03-31 16:01:22 -04:00
907918b492 Merge multi-value options when extending Aanand Prasad 2015-03-30 18:20:34 -04:00
6dbe321a45 Merge pull request #1225 from aanand/fix-1222 Aanand Prasad 2015-03-31 15:23:34 -04:00
2a415ede08 When extending, build replaces image and vice versa Aanand Prasad 2015-03-30 17:14:19 -04:00
43369cda9c Merge pull request #1221 from aanand/update-swarm-doc Ben Firshman 2015-03-30 18:08:16 +01:00
a2557a3354 Merge pull request #1198 from funkyfuture/reformat-contributing.md Aanand Prasad 2015-03-30 12:08:56 -04:00
1a14449fe6 Update Swarm doc Aanand Prasad 2015-03-30 11:33:21 -04:00
0b89ae6f20 [cli] run --rm overrides restart: always Joseph Page 2015-03-27 11:31:43 +01:00
cec6dc28bb implemented @fredl suggestions Patrick Chanezon 2015-03-27 17:12:29 -07:00
853ce255ea Merge pull request #1202 from aanand/jenkins-script Aanand Prasad 2015-03-27 14:59:49 -07:00
db852e14e4 Add script/ci Aanand Prasad 2015-03-23 14:16:14 -07:00
98dd0cd1f8 implemented @aanand comments Patrick Chanezon 2015-03-27 13:26:51 -07:00
c441ac90d6 paulczar fixes plus example file Patrick Chanezon 2015-03-26 16:35:53 -07:00
9d7b54d8fd Merge pull request #1183 from pborreli/patch-2 Aanand Prasad 2015-03-26 12:31:07 -07:00
59f04c6e29 Fixed typo Pascal Borreli 2015-03-26 01:43:23 +00:00
367ae0c848 Merge pull request #1185 from akoskaaa/master Aanand Prasad 2015-03-26 10:04:37 -07:00
4e0f555c58 make flake8 a bit more specific akoskaaa 2015-03-26 09:09:15 -07:00
baf18decae Merge pull request #1179 from aanand/test-1.6-rc Ben Firshman 2015-03-26 14:18:36 +00:00
826b8ca4d3 Reformat CONTRIBUTING.md funkyfuture 2015-03-26 13:11:05 +01:00
fa2fb6bd38 [pep8] flake8 run for everything, fix items from this change akoskaaa 2015-03-25 23:15:34 -07:00
f9ea5ecf40 [pep8] make test files and config files pep8 valid akoskaaa 2015-03-25 20:13:01 -07:00
99f7eba930 Add Docker 1.6 RC2 to tested versions Aanand Prasad 2015-03-25 14:48:36 -07:00
ff3a5451fe Bump 1.2.0 1.2.0rc2 Aanand Prasad 2015-03-23 10:40:23 -07:00
e1b27acd02 Add contributing section to readme Ben Firshman 2015-03-19 18:05:45 -07:00
9aab7bc242 Merge pull request #1172 from aanand/fix-dns Ben Firshman 2015-03-25 16:11:13 +00:00
83dcceacaf Fix regression in Dns and DnsSearch settings Aanand Prasad 2015-03-24 16:17:05 -07:00
07ea20efe4 Bump 1.2.0 1.2.0rc1 Aanand Prasad 2015-03-23 10:40:23 -07:00
1f06070f12 Merge pull request #1160 from aanand/fix-volume-merging Aanand Prasad 2015-03-24 13:40:07 -07:00
35c6e0314c Fix volume merging when there's no explicit host path Aanand Prasad 2015-03-23 11:40:44 -07:00
276e43ca6b Fix service dict merging when only one dict has a volumes key Aanand Prasad 2015-03-23 11:31:30 -07:00
b7046777d1 Merge pull request #1161 from aanand/revert-labels-and-dependencies Aanand Prasad 2015-03-24 13:05:46 -07:00
1c14fc06da Update docker-py and requests version ranges Aanand Prasad 2015-03-23 14:44:28 -07:00
f4ef2c09d6 Revert "Remove restriction for requests version, update docker-py requirement" Aanand Prasad 2015-03-23 14:42:21 -07:00
16495c577b Revert "Use dev version of Docker" Aanand Prasad 2015-03-23 14:41:53 -07:00
965426e39b Revert "Add 'labels:' config option" Aanand Prasad 2015-03-23 14:41:43 -07:00
02f119e4b7 Merge pull request #1145 from aanand/labels Aanand Prasad 2015-03-20 18:53:26 -07:00
721327110d Add 'labels:' config option Aanand Prasad 2015-03-19 16:10:27 -07:00
d209ded13c Use dev version of Docker Aanand Prasad 2015-03-19 11:21:58 -07:00
49c2080bcd Merge pull request #1088 from aanand/extends Aanand Prasad 2015-03-20 16:00:50 -07:00
37efdb1f8b Make volume host paths relative to file, merge volumes when extending Aanand Prasad 2015-03-18 18:23:17 -07:00
4c582e4352 Implement extends Aanand Prasad 2015-03-18 13:51:27 -07:00
5dca6c232e Merge pull request #972 from aanand/set-host-config-at-create-time Aanand Prasad 2015-03-20 15:43:52 -07:00
eef4bc3917 Specify all HostConfig at create time Aanand Prasad 2015-02-16 14:30:31 +00:00
9931cd2c4c Merge pull request #1140 from jfrazelle/add-to-readme Ben Firshman 2015-03-20 01:03:37 +00:00
0226675766 Add build status \o/ Jessica Frazelle 2015-03-19 17:50:15 -07:00
ae9c965823 Merge pull request #1128 from aanand/jenkins-dco Ben Firshman 2015-03-18 14:49:40 +00:00
d7a90092c2 Merge pull request #1118 from funkyfuture/issue-1082 Daniel Nephin 2015-03-17 21:39:34 -04:00
85fb8956f3 Validate DCO in script/test-versions Aanand Prasad 2015-03-17 17:01:36 -07:00
1e5b9dc2eb Merge pull request #1005 from aanand/docker-in-docker Ben Firshman 2015-03-17 15:13:59 +00:00
d21b8f1ba3 Merge pull request #1112 from bfirsh/remove-wercker-from-readme Ben Firshman 2015-03-16 23:53:18 +00:00
4c5a80f253 Change port in ports-composefile to 49152 funkyfuture 2015-03-17 00:21:29 +01:00
198598c936 Remove wercker status from readme Ben Firshman 2015-03-13 19:36:54 +00:00
8b5a882459 Merge pull request #867 from knutwalker/feature/timeout-flag Ben Firshman 2015-03-13 17:41:16 +00:00
dae451019b Merge pull request #1099 from aanand/fix-env-file-resolution Ben Firshman 2015-03-13 16:49:10 +00:00
dfc729b8f2 Merge pull request #1108 from aanand/fix-deps-tests Ben Firshman 2015-03-13 16:38:25 +00:00
eb7ea76d6c Merge pull request #1100 from vmalloc/patch-3 Aanand Prasad 2015-03-13 16:22:40 +00:00
3c8ef6a94c Fix Project.up() tests Aanand Prasad 2015-03-13 14:51:26 +00:00
081afd9bbf Merge pull request #1097 from aanand/script-shell Ben Firshman 2015-03-13 14:43:47 +00:00
528bed9ef6 Fix environment resolution Aanand Prasad 2015-03-12 13:59:23 +00:00
4ecf5e01ff Extract YAML loading and parsing into config module Aanand Prasad 2015-02-27 11:54:57 +00:00
81a32a266f Remove restriction for requests version, update docker-py requirement Rotem Yaari 2015-03-13 12:40:13 +02:00
25c70c2af4 Merge pull request #1076 from gilclark/master Aanand Prasad 2015-03-13 11:46:13 +00:00
f393447ac9 Docs: yml link in getting started with django likeon 2015-03-05 19:43:02 +03:00