Relevant Background Details
- We've got two types of VMs (Utility Boxes & Web Servers) that developers need.
- We are going to be using git for version control.
- We have developers who have different preferences for their working environment (e.g. Some Linux, Some Windows).
- I'm in the Linux camp and I believe Git and Windows doesn't mix as well as Linux & Git. However, this could be personal bias.
- We using Linux in production.
Building the Vagrant VMs for distribution
- Build a base box with the relevant OS for vagrant.
- Using a configuration manager (e.g. Chef) to build out the Utility & Web images, convert them to new base boxes. It will clone service configurations from a centralized git repository.
- Distribute the base boxes (really just virtual machine images) for the users to develop locally with vagrant. The distributed box will automatically pull in source code from certain git repos (e.g. libraries).
- If changes are planned for the production environment, all developers will need to pull down new base boxes for vagrant as they come prepackaged. I think this is the simplest way for a new developer to deal with it. Staging is updated to match the new development VMs in preparation.
- Get assigned an issue from the issue tracker.
- Use the vagrant VM to clone the current dev repository into the folder it shares with the host OS (so the Developer can use their favorite IDE).
- Developer commits changes and tests locally.
- When satisfied, Developer merges his changes to the dev repository. If conflicts, work with the Developer commited the conflicting code to resolve the issue.
- When Dev is in a stable state, Dev is merged with the current Staging repository for QA of the new features. Nothing is pushed from Dev to Staging until Step #6 is completed. Hooks generate new copy of documentation for Staging.
- Staging is cloned into Production once the QA is completed. Hooks generate new copy of documentation for Production.
Is there any obvious flaws/pitfalls in the above or steps that are generally considered 'best practices' that should be added?