Merge pull request #391 from bfirsh/repository-move

github.com/docker/fig
This commit is contained in:
Aanand Prasad 2014-08-07 14:49:26 -07:00
commit 1346805bef
6 changed files with 8 additions and 10 deletions

View File

@ -6,7 +6,7 @@ If you're looking contribute to [Fig](http://www.fig.sh/)
but you're new to the project or maybe even to Python, here are the steps but you're new to the project or maybe even to Python, here are the steps
that should get you started. that should get you started.
1. Fork [https://github.com/orchardup/fig](https://github.com/orchardup/fig) to your username. kvz in this example. 1. Fork [https://github.com/docker/fig](https://github.com/docker/fig) to your username. kvz in this example.
1. Clone your forked repository locally `git clone git@github.com:kvz/fig.git`. 1. Clone your forked repository locally `git clone git@github.com:kvz/fig.git`.
1. Enter the local directory `cd fig`. 1. Enter the local directory `cd fig`.
1. Set up a development environment `python setup.py develop`. That will install the dependencies and set up a symlink from your `fig` executable to the checkout of the repo. So from any of your fig projects, `fig` now refers to your development project. Time to start hacking : ) 1. Set up a development environment `python setup.py develop`. That will install the dependencies and set up a symlink from your `fig` executable to the checkout of the repo. So from any of your fig projects, `fig` now refers to your development project. Time to start hacking : )

View File

@ -1,7 +1,7 @@
Fig Fig
=== ===
[![Build Status](https://travis-ci.org/orchardup/fig.svg?branch=master)](https://travis-ci.org/orchardup/fig) [![Build Status](https://travis-ci.org/docker/fig.svg?branch=master)](https://travis-ci.org/docker/fig)
[![PyPI version](https://badge.fury.io/py/fig.png)](http://badge.fury.io/py/fig) [![PyPI version](https://badge.fury.io/py/fig.png)](http://badge.fury.io/py/fig)
Fast, isolated development environments using Docker. Fast, isolated development environments using Docker.
@ -41,8 +41,6 @@ There are commands to:
- tail running services' log output - tail running services' log output
- run a one-off command on a service - run a one-off command on a service
Fig is a project from [Orchard](https://orchardup.com), a Docker hosting service. [Follow us on Twitter](https://twitter.com/orchardup) to keep up to date with Fig and other Docker news.
Installation and documentation Installation and documentation
------------------------------ ------------------------------

View File

@ -44,14 +44,14 @@
</ul> </ul>
</ul> </ul>
<ul class="nav"> <ul class="nav">
<li><a href="https://github.com/orchardup/fig">Fig on GitHub</a></li> <li><a href="https://github.com/docker/fig">Fig on GitHub</a></li>
<li><a href="http://webchat.freenode.net/?channels=%23docker-fig&uio=d4">#docker-fig on Freenode</a></li> <li><a href="http://webchat.freenode.net/?channels=%23docker-fig&uio=d4">#docker-fig on Freenode</a></li>
</ul> </ul>
<p>Fig is a project from <a href="https://www.docker.com">Docker</a>.</p> <p>Fig is a project from <a href="https://www.docker.com">Docker</a>.</p>
<div class="badges"> <div class="badges">
<iframe src="http://ghbtns.com/github-btn.html?user=orchardup&amp;repo=fig&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe> <iframe src="http://ghbtns.com/github-btn.html?user=docker&amp;repo=fig&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://orchardup.github.io/fig/">Tweet</a> <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://orchardup.github.io/fig/">Tweet</a>
</div> </div>
</div> </div>

View File

@ -137,4 +137,4 @@ If you started Fig with `fig up -d`, you'll probably want to stop your services
$ fig stop $ fig stop
That's more-or-less how Fig works. See the reference section below for full details on the commands, configuration file and environment variables. If you have any thoughts or suggestions, [open an issue on GitHub](https://github.com/orchardup/fig). That's more-or-less how Fig works. See the reference section below for full details on the commands, configuration file and environment variables. If you have any thoughts or suggestions, [open an issue on GitHub](https://github.com/docker/fig).

View File

@ -16,12 +16,12 @@ Docker has guides for [Ubuntu](http://docs.docker.io/en/latest/installation/ubun
Next, install Fig. On OS X: Next, install Fig. On OS X:
$ curl -L https://github.com/orchardup/fig/releases/download/0.5.2/darwin > /usr/local/bin/fig $ curl -L https://github.com/docker/fig/releases/download/0.5.2/darwin > /usr/local/bin/fig
$ chmod +x /usr/local/bin/fig $ chmod +x /usr/local/bin/fig
On 64-bit Linux: On 64-bit Linux:
$ curl -L https://github.com/orchardup/fig/releases/download/0.5.2/linux > /usr/local/bin/fig $ curl -L https://github.com/docker/fig/releases/download/0.5.2/linux > /usr/local/bin/fig
$ chmod +x /usr/local/bin/fig $ chmod +x /usr/local/bin/fig
Fig is also available as a Python package if you're on another platform (or if you prefer that sort of thing): Fig is also available as a Python package if you're on another platform (or if you prefer that sort of thing):

View File

@ -13,7 +13,7 @@ if [ ! -d "$GIT_DIR" ]; then
fi fi
if !(git remote | grep origin); then if !(git remote | grep origin); then
git remote add origin git@github.com:orchardup/fig.git git remote add origin git@github.com:docker/fig.git
fi fi
git fetch origin git fetch origin