Commit Graph

  • 27747b9cd7 Manually merging changes from lastest master Michael Townley 2014-02-21 17:02:25 -0600
  • 89d30a7976 Cleaning up, mods where made before pulling from latest head Michael Townley 2014-02-21 16:56:16 -0600
  • 96aec07a33 Added support for setting alternate fig files, and specifying environments from fig files via the command line. Michael Townley 2014-02-21 16:37:20 -0600
  • dfc762d7e9 Merge 76c1904f22 into 05e15e27ef Ben Firshman 2014-02-19 23:09:35 +0000
  • 05e15e27ef Use sys.exit instead of global Ben Firshman 2014-02-19 22:42:21 +0000
  • 51131813a3 Fix broken manifest Ben Firshman 2014-02-19 08:52:44 +0000
  • 76c1904f22 Use Orchard to run tests Ben Firshman 2014-02-18 16:21:30 +0000
  • d89594ac42 update Ben Firshman 2014-02-18 10:56:42 +0000
  • 1327e293f6 Add Dockerfile filename to wordpress guide Ben Firshman 2014-02-18 10:56:21 +0000
  • 7b0274bddb update Ben Firshman 2014-02-18 10:54:06 +0000
  • 2edc372f41 Update Wordpress guide so you can edit code Ben Firshman 2014-02-18 10:52:24 +0000
  • d368e2fca9 Ship 0.2.2 0.2.2 Ben Firshman 2014-02-17 21:37:31 +0000
  • b9c8e3e057 Fix scale not binding ports Ben Firshman 2014-02-17 21:33:05 +0000
  • 5d4210ceb3 Fix tests when there is an image with int tag Ben Firshman 2014-02-17 21:32:48 +0000
  • 0b10c77349 Merge f8fb83f0fc into 4a6897ef3b Adrien Candiotti 2014-02-14 02:59:40 +0100
  • f8fb83f0fc mod - there was a mix with the feature/env branch Adrien Candiotti 2014-02-14 02:58:04 +0100
  • e703414cb4 mod - interface binding function didn't work if no ports were specified Adrien Candiotti 2014-02-14 02:41:31 +0100
  • 0b8315f17b Merge branch 'feature/env' into develop Adrien Candiotti 2014-02-14 02:32:31 +0100
  • 920ed739b3 Merge branch 'feature/interface_bind' into develop Adrien Candiotti 2014-02-14 02:31:00 +0100
  • ba3d6dcea8 mod - fig/service.py, made a function for port_bindings Adrien Candiotti 2014-02-13 15:06:09 +0100
  • 672a950378 mod - fix in service.py, a port forwarded to a random port and an ip address (ex: 127.0.0.1:4242) wasn't configured correctly Adrien Candiotti 2014-02-13 14:50:19 +0100
  • 1c4aa555a8 Merge d694d9360c into 4a6897ef3b Kyle Mathews 2014-02-12 19:14:12 -0800
  • 4a6897ef3b Merge pull request #91 from barnybug/master Ben Firshman 2014-02-12 19:39:08 +0000
  • fbff8983e4 Merge pull request #83 from dustinlacewell/print-logs-during-attach Aanand Prasad 2014-02-12 11:35:24 -0800
  • 6431d52a2e Implement topological sort using Cormen/Tarjan algorithm to handle a->b->c dependencies and detect a->b->c->a cycles. Barnaby Gray 2014-02-12 09:09:55 +0000
  • 7faba11245 Merge pull request #87 from orchardup/stop-projects-in-reverse-order-to-starting Aanand Prasad 2014-02-09 16:22:05 -0800
  • 4723345473 Stop projects in reverse order to starting Ben Firshman 2014-02-09 16:01:13 -0800
  • b310516ba7 Merge pull request #86 from orchardup/update-to-docker-0.8.0 Ben Firshman 2014-02-08 03:41:03 +0000
  • 049a10136c Test Docker 0.8.0 on Travis Ben Firshman 2014-02-07 10:35:18 -0800
  • 511a9beede Tell fig up to print logs before attaching Dustin Lacewell 2014-02-05 17:19:18 -0800
  • d694d9360c Update wordpress.md Kyle Mathews 2014-02-05 15:01:30 -0800
  • a8bc51b229 Merge pull request #80 from orchardup/ship-0.2.1 0.2.1 Ben Firshman 2014-02-04 18:17:26 -0800
  • 6bad9484be Ship 0.2.1 Aanand Prasad 2014-02-04 18:14:19 -0800
  • d52f73b29a Merge pull request #79 from orchardup/strict-config Ben Firshman 2014-02-04 18:10:42 -0800
  • edf8f14ac0 Throw an error if you specify an unrecognised option in `fig.yml` Aanand Prasad 2014-02-04 16:33:29 -0800
  • c6e4be356c update Ben Firshman 2014-02-04 17:15:25 -0800
  • 9faa7e47ed Lock version of docker-osx on home page Ben Firshman 2014-02-04 17:14:57 -0800
  • f92317c5ee Merge pull request #77 from orchardup/friendlier-connection-error Ben Firshman 2014-02-04 17:04:21 -0800
  • 194bb189f1 update Ben Firshman 2014-02-04 15:47:30 -0800
  • fea3bc2eb1 Install docker-osx from tag Ben Firshman 2014-02-04 15:47:12 -0800
  • 2b89494405 Fix Ubuntu check - forgot to actually inspect the distro Aanand Prasad 2014-02-04 15:31:05 -0800
  • 2bac1c10b0 Show installation instructions if it looks like Docker isn't installed Aanand Prasad 2014-02-04 15:19:50 -0800
  • 5126649de4 Friendlier connection error for docker-osx users Aanand Prasad 2014-02-04 14:42:55 -0800
  • f81b375698 mod - cleaner standard way to expand env variables Adrien Candiotti 2014-02-04 04:05:49 -0800
  • 09a096bbea add - env variable expand Adrien Candiotti 2014-02-04 03:59:28 -0800
  • f110d7177e add - interface binding in fig/service.py:start_container Adrien Candiotti 2014-02-04 02:33:10 -0800
  • 690a7d6dd7 Add /build to gitignore Ben Firshman 2014-02-03 16:01:30 -0800
  • 7a46c181ad update Ben Firshman 2014-02-03 16:00:23 -0800
  • 19c0c9bf06 Specify working docker-osx version in docs Ben Firshman 2014-02-03 16:00:01 -0800
  • ed9037703f Dirty solution for onStart, onStop container events Shavrin Ivan 2014-02-01 22:14:52 +0400
  • 53958cf9df Merge pull request #70 from orchardup/ship-0.2.0 0.2.0 Aanand Prasad 2014-01-31 02:57:38 -0800
  • f94ce7767c Ship 0.2.0 Ben Firshman 2014-01-31 10:52:57 +0000
  • 62607f4f04 Merge pull request #67 from orchardup/link-services-to-themselves Ben Firshman 2014-01-31 02:46:52 -0800
  • e4e9f0bc19 Link services to themselves Ben Firshman 2014-01-19 20:43:31 +0000
  • beb58a41c2 Add comparison to Vagrant and Foreman Ben Firshman 2014-01-30 10:58:42 +0000
  • e0637990aa Document how one-off commands are configured Ben Firshman 2014-01-30 10:50:42 +0000
  • 26308ade7b update Ben Firshman 2014-01-30 10:49:39 +0000
  • 03842f92e8 Document how to see env vars for a service Ben Firshman 2014-01-30 10:48:25 +0000
  • 315f5c919e update Ben Firshman 2014-01-30 10:49:21 +0000
  • 8a2bbeb1eb Merge pull request #52 from cameronmaske/fix-sort-service-dicts Ben Firshman 2014-01-29 15:47:43 -0800
  • e02d5c06cd update Ben Firshman 2014-01-29 23:36:45 +0000
  • 95681246a5 Merge pull request #66 from damianmoore/doc_django_fix_psycopg Ben Firshman 2014-01-29 15:36:25 -0800
  • 80279f71d8 Fixed error where Django can't connect to Postgres because psycopg2 is not installed Damian Moore 2014-01-29 20:01:11 +0000
  • ae7573b9b8 Fix for #48. Cameron Maske 2014-01-23 22:27:54 +0000
  • acfcd8fdd4 Merge 89561a6412 into ee880ca7be Spencer Herzberg 2014-01-29 05:58:22 -0800
  • ee880ca7be Fix recreate_containers test Aanand Prasad 2014-01-29 13:57:28 +0000
  • 89561a6412 initial commit of run command aliases Spencer Herzberg 2014-01-28 22:28:39 -0600
  • 21837ac132 Update docker-py Ben Firshman 2014-01-28 13:42:18 +0000
  • e3f0b8ebdc update Ben Firshman 2014-01-28 14:39:58 +0000
  • c270c13baa Move command to fig.yml Ben Firshman 2014-01-28 14:39:21 +0000
  • cbdeff99ee Fix broken test on Python 3 Ben Firshman 2014-01-28 13:45:47 +0000
  • 303e0cfd86 Update docker-py Ben Firshman 2014-01-28 13:34:40 +0000
  • d0bf05248d Clarify which files code examples go in. Elliot Murphy 2014-01-28 08:18:49 -0500
  • 1cfafbaf63 update Ben Firshman 2014-01-28 12:46:32 +0000
  • 880bc0d8e3 Fix link to running Django example Ben Firshman 2014-01-28 12:45:55 +0000
  • 89d2653662 Add links to Dockerfile docs Ben Firshman 2014-01-28 12:45:03 +0000
  • aa18d51760 update Ben Firshman 2014-01-28 12:46:16 +0000
  • 8b75f7c7d3 Merge pull request #58 from mrchrisadams/load_yaml_as_well_as_yml Ben Firshman 2014-01-28 03:35:25 -0800
  • 56dc9a77cc update Ben Firshman 2014-01-28 10:33:13 +0000
  • 9967d706e9 Simplify getting started guide Ben Firshman 2014-01-28 10:32:55 +0000
  • d5bc521ab0 Use new envvar format in getting started guide Ben Firshman 2014-01-28 10:25:02 +0000
  • d4f76ba5f9 Add open-docs script Ben Firshman 2014-01-28 10:13:15 +0000
  • 239da2ef69 Add missing return value for filename check Chris Adams 2014-01-28 09:51:33 +0000
  • 1d18d747a5 Support loading in Figfiles with .yaml extension Chris Adams 2014-01-28 00:43:23 +0000
  • 78f5d7a094 update Ben Firshman 2014-01-28 00:20:20 +0000
  • 2883b5be6b Add note about postgres image settings Ben Firshman 2014-01-28 00:19:38 +0000
  • e34b433d93 Build docs before deploying Ben Firshman 2014-01-28 00:16:29 +0000
  • 1fe5e553dc update Ben Firshman 2014-01-28 00:15:57 +0000
  • 8d2b31def7 update Ben Firshman 2014-01-28 00:15:02 +0000
  • 16329bda7a update Ben Firshman 2014-01-28 00:08:20 +0000
  • b6d0b8468b Fix ordering in dockerfile Ben Firshman 2014-01-28 00:07:59 +0000
  • 5e5bd939be Stop force-pushing to gh-pages Aanand Prasad 2014-01-27 21:43:37 +0000
  • 140ccc7d4e Wordpress getting-started guide Aanand Prasad 2014-01-27 21:43:22 +0000
  • 9750ae1958 update Aanand Prasad 2014-01-27 21:42:21 +0000
  • f1b852f0cf update Aanand Prasad 2014-01-27 21:42:05 +0000
  • b4cbcbefa6 Remove project name from envvars in docs Ben Firshman 2014-01-27 21:12:14 +0000
  • 3f88462bac update Ben Firshman 2014-01-27 21:05:40 +0000
  • 9049f4e378 Add IRC to docs Ben Firshman 2014-01-27 21:05:16 +0000
  • cfe48e4a14 update Ben Firshman 2014-01-27 20:37:07 +0000
  • 0e58c05361 Cache bust docs CSS Ben Firshman 2014-01-27 20:36:57 +0000