Skip to content

Rebrand (pre-RC) #835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 7 commits into from
Jan 20, 2015
Merged

Rebrand (pre-RC) #835

merged 7 commits into from
Jan 20, 2015

Conversation

aanand
Copy link

@aanand aanand commented Jan 12, 2015

Replaces #806.

Future versions of Fig are going to be rebranded to fit alongside the suite of Docker orchestration tools (the other ones currently being Machine and Swarm). The new name is Compose.

A number of things need to be done to make this happen:

  • Rename the fig Python module to compose
  • Rename fig.yml to compose.yml
  • Deprecate FIG_* environment variables, introduce COMPOSE_* equivalents
  • Rename the fig executable
    • Choose a name (chosen: docker-compose)
    • Rename Python stub at bin/fig
    • Rename binaries built by script/build-osx and script/build-linux
    • Update the Dockerfile
  • Update name in docs, including all instances of:
    • fig executable
    • fig.yml
    • “Fig”
  • Remove all website-related stuff from docs
    • Jekyll tooling (Dockerfile, fig.yml, build script)
    • CSS
    • Images
    • Markup
  • Update name in README.md, ROADMAP.md and CONTRIBUTING.md
  • Remove rebranding plans from ROADMAP.md
  • Check that we haven’t messed up the word “config” (or any of its derivatives) anywhere
  • Create a new PyPi package called docker-compose

@aanand aanand mentioned this pull request Jan 12, 2015
Closed
19 tasks
@aanand aanand added this to the 1.1.0 milestone Jan 12, 2015
@bfirsh
Copy link

bfirsh commented Jan 12, 2015

Looks good! We probably can't call the binary "compose". Could we add a to-do item for choosing a name for the binary, so this does not look complete if you rename it to "compose"?

@dnephin
Copy link

dnephin commented Jan 12, 2015

Maybe docker-compose for the pypi package?

Another task might be: Update IRC channel in the docs to #docker-compose (and register the new channel) ?

@aanand
Copy link
Author

aanand commented Jan 12, 2015

@bfirsh @dnephin done.

@bfirsh
Copy link

bfirsh commented Jan 13, 2015

  • We also need to make it very clear in the documentation that "Compose" was called "Fig". So if you land on, e.g. www.fig.sh, it needs to be clearly explained what's going on and what Compose is.
  • We probably want a redirect from www.fig.sh -> docs.docker.com/whatever

@albers albers mentioned this pull request Jan 13, 2015
Merged
@aanand
Copy link
Author

aanand commented Jan 13, 2015

Are we really happy to redirect people from www.fig.sh? If people continue to use Fig for legacy reasons, I don't want to take their documentation away.

Hence "Add a deprecation warning to all pages on www.fig.sh" - I'm thinking a banner at the top saying "Fig has been deprecated and replaced by Docker Compose (link to docs.docker.com)".

@bfirsh
Copy link

bfirsh commented Jan 13, 2015

👍 sounds good

@bfirsh
Copy link

bfirsh commented Jan 16, 2015

This plan should probably also take into account that we're doing an official RC release.

E.g. we should be tagging and releasing 1.1.0-rc1

@aanand aanand force-pushed the rebrand branch 2 times, most recently from abade8c to f2f9ad3 Compare January 20, 2015 15:27
@sdurrheimer
Copy link

Any due date for the 1.1.0 ? I was hopping a new release of fig in order to use envfile and dns-search option, but with the rebrand this will take maybe longer.

@aanand aanand changed the title WIP: Rebrand WIP: Rebrand (pre-RC) Jan 20, 2015
@aanand aanand mentioned this pull request Jan 20, 2015
Merged
@aanand aanand changed the title WIP: Rebrand (pre-RC) Rebrand (pre-RC) Jan 20, 2015
aanand added 6 commits January 20, 2015 21:00
@aanand
WIP: rename Fig to Compose
2af7693 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Rename binary to docker-compose and config file to docker-compose.yml
620e29b 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Update README.md, ROADMAP.md and CONTRIBUTING.md
c981ce9 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Find-and-replace on docs
e3c4a66 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Manual fixes to docs
724be54 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Remove all website-related stuff from docs
8297f55 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Copy link
Author

aanand commented Jan 20, 2015

Rebased, build is green.

dnephin
dnephin reviewed Jan 20, 2015
View reviewed changes
compose/cli/command.py
"than 'fig.yml'")
log.warning("Please be aware that fig.yml the expected extension "
if os.path.exists(os.path.join(self.base_dir, 'docker-compose.yaml')):
log.warning("Fig just read the file 'docker-compose.yaml' on startup, rather "
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Compose just read the file..." ?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A fallback to fig.yml would be good too

@dnephin
Copy link

dnephin commented Jan 20, 2015

merging in-flight branches is going to be some work after this, but not much to be done about that

@aanand
Fix typos
16d6018 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Copy link
Author

aanand commented Jan 20, 2015

Typos fixed.

@dnephin
Copy link

dnephin commented Jan 20, 2015

LGTM

@aanand
Copy link
Author

aanand commented Jan 20, 2015

rebranding_0

aanand added a commit that referenced this pull request Jan 20, 2015
@aanand
Merge pull request #835 from aanand/rebrand
4869fed 
Rebrand (pre-RC)
@aanand aanand merged commit 4869fed into docker:master Jan 20, 2015
@aanand aanand deleted the rebrand branch January 20, 2015 22:24
@albers
Copy link

albers commented Jan 20, 2015

I will take care of rebranding the bash completion very soon.

@Starefossen
Copy link

What about:

  • repo name (dicker/fig => docker/compose)
  • domain name (fig.sh => compose.sh)
  • maybe add a note in README.md about "previously known as fig"

@aanand
Copy link
Author

aanand commented Jan 21, 2015

  • We'll rename the repo for the stable release.
  • There won't be a separate website for Compose - its docs will be rolled into docs.docker.com. www.fig.sh will stay up, and we'll add a banner to the top pointing people to the Compose docs.
  • Good idea.

@albers
Copy link

albers commented Jan 22, 2015

Bash completion is rebranded, see #871.

@aanand
Copy link
Author

aanand commented Jan 22, 2015

@lePoxy We've released 1.1.0-rc1 - give it a whirl.

@sdurrheimer
Copy link

@aanand Saw it the day you released it, thanks :)

@Starefossen
Copy link

Hmm... fig was a lot shorter to type than docker-compose. Why couldn't the binary at least be compose?

@sdurrheimer sdurrheimer mentioned this pull request Jan 24, 2015
Closed
@k4nar k4nar mentioned this pull request Feb 25, 2015
Closed
yuval-k pushed a commit to yuval-k/compose that referenced this pull request Apr 10, 2015
@aanand
Merge pull request docker#835 from aanand/rebrand
82ab647 
Rebrand (pre-RC)
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.
6 participants
@aanand @bfirsh @dnephin @sdurrheimer @albers @Starefossen