From bdbcefbd7ab5a75c0d3331d383648e521a0695cb Mon Sep 17 00:00:00 2001 From: Blaine Morgan Date: Fri, 25 Apr 2014 12:01:15 -0700 Subject: [PATCH 1/5] Added boxen upgrade instructions --- README.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/README.md b/README.md index 5ae02a4..ee8dbd5 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,43 @@ fork. You'll still be the maintainer, you'll still own the issues and PRs. It'll just be listed under the boxen org so folks can find it more easily. +##upgrading boxen +distilled from http://grahamgilbert.com/blog/2014/04/04/updating-boxen/ +As Boxen is made by GitHub, updating it is much like updating any other project on there that you’ve made a fork of. First we’re going to add it as a remote repository: + +```bash +cd ~/src/our-boxen +git remote add upstream https://github.com/boxen/our-boxen.git +``` +Then we’re going to fetch the stuff from the upstream repository: + +```bash +git fetch upstream +``` + +Now we’re going to merge the updated repository with our own: + +```bash +git checkout master +git merge upstream/master +``` + +Now deal with conflicts in (Puppetfile, manifests/site.pp), ignore any diffs in Puppetfile.lock and Gemfile.lock. + + +```bash +git mergetool +``` + +The next step is to update your Puppet modules and RubyGems. First delete Puppetfile.lock and Gemfile.lock. Now go back to your trusty Terminal and: + +```bash +rm Puppetfile.lock Gemfile.lock +bundle install --without development +bundle exec librarian-puppet install --clean +``` + + ## Integrating with Github Enterprise If you're using a Github Enterprise instance rather than github.com, From bace1f5def255c1601af597f0ddf8376dd8d403a Mon Sep 17 00:00:00 2001 From: Blaine Morgan Date: Fri, 16 May 2014 16:01:44 -0700 Subject: [PATCH 2/5] Added more detailed update process --- docs/faq.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 72e659f..f013817 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -10,6 +10,43 @@ When removing applications make sure to remove the corresponding `/var/db/.puppe Run `script/nuke` from inside the `/opt/boxen/repo` directory. +### Q: How do you upgrade your boxem from the public our-boxen? +Anwser distilled from http://grahamgilbert.com/blog/2014/04/04/updating-boxen/ +As Boxen is made by GitHub, updating it is much like updating any other project on there that you’ve made a fork of. First we’re going to add it as a remote repository: + +```bash +cd ~/src/our-boxen +git remote add upstream https://github.com/boxen/our-boxen.git +``` +Then we’re going to fetch the stuff from the upstream repository: + +```bash +git fetch upstream +``` + +Now we’re going to merge the updated repository with our own: + +```bash +git checkout master +git merge upstream/master +``` + +Now deal with conflicts in (Puppetfile, manifests/site.pp), ignore any diffs in Puppetfile.lock and Gemfile.lock. + + +```bash +git mergetool +``` + +The next step is to update your Puppet modules and RubyGems. First delete Puppetfile.lock and Gemfile.lock. Now go back to your trusty Terminal and: + +```bash +rm Puppetfile.lock Gemfile.lock +bundle install --no-deployment --without development +bundle exec librarian-puppet install --clean +``` + + ### Q: What's a good approach to merging our-boxen back into my private fork? One approach is to delete the Gemfile.lock and Puppetfile.lock and run: From ff9161ec73939dbba26d09ccd2d72d9179ce3264 Mon Sep 17 00:00:00 2001 From: Blaine Morgan Date: Fri, 16 May 2014 16:03:17 -0700 Subject: [PATCH 3/5] Moved Upgrading instructions to FAQ --- README.md | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/README.md b/README.md index ee8dbd5..12666da 100644 --- a/README.md +++ b/README.md @@ -316,41 +316,7 @@ You'll still be the maintainer, you'll still own the issues and PRs. It'll just be listed under the boxen org so folks can find it more easily. ##upgrading boxen -distilled from http://grahamgilbert.com/blog/2014/04/04/updating-boxen/ -As Boxen is made by GitHub, updating it is much like updating any other project on there that you’ve made a fork of. First we’re going to add it as a remote repository: - -```bash -cd ~/src/our-boxen -git remote add upstream https://github.com/boxen/our-boxen.git -``` -Then we’re going to fetch the stuff from the upstream repository: - -```bash -git fetch upstream -``` - -Now we’re going to merge the updated repository with our own: - -```bash -git checkout master -git merge upstream/master -``` - -Now deal with conflicts in (Puppetfile, manifests/site.pp), ignore any diffs in Puppetfile.lock and Gemfile.lock. - - -```bash -git mergetool -``` - -The next step is to update your Puppet modules and RubyGems. First delete Puppetfile.lock and Gemfile.lock. Now go back to your trusty Terminal and: - -```bash -rm Puppetfile.lock Gemfile.lock -bundle install --without development -bundle exec librarian-puppet install --clean -``` - +See [FAQ-Upgrading](https://github.com/nbmorgan/our-boxen/blob/master/docs/faq.md#q-how-do-you-upgrade-your-boxem-from-the-public-our-boxen). ## Integrating with Github Enterprise From cfe24f76bb2cc68f91b004f3ac4fb45a5f78bc42 Mon Sep 17 00:00:00 2001 From: Blaine Morgan Date: Fri, 16 May 2014 17:04:45 -0700 Subject: [PATCH 4/5] fixed spelling error --- docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.md b/docs/faq.md index f013817..cc7d7f0 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -10,7 +10,7 @@ When removing applications make sure to remove the corresponding `/var/db/.puppe Run `script/nuke` from inside the `/opt/boxen/repo` directory. -### Q: How do you upgrade your boxem from the public our-boxen? +### Q: How do you upgrade your boxen from the public our-boxen? Anwser distilled from http://grahamgilbert.com/blog/2014/04/04/updating-boxen/ As Boxen is made by GitHub, updating it is much like updating any other project on there that you’ve made a fork of. First we’re going to add it as a remote repository: From cb8fb9c55c488b40794f8c16cbf62c97244f23c1 Mon Sep 17 00:00:00 2001 From: Blaine Morgan Date: Sun, 18 May 2014 17:51:12 -0700 Subject: [PATCH 5/5] Update README.md Other boxem fixed. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12666da..b118600 100644 --- a/README.md +++ b/README.md @@ -316,7 +316,7 @@ You'll still be the maintainer, you'll still own the issues and PRs. It'll just be listed under the boxen org so folks can find it more easily. ##upgrading boxen -See [FAQ-Upgrading](https://github.com/nbmorgan/our-boxen/blob/master/docs/faq.md#q-how-do-you-upgrade-your-boxem-from-the-public-our-boxen). +See [FAQ-Upgrading](https://github.com/boxen/our-boxen/blob/master/docs/faq.md#q-how-do-you-upgrade-your-boxen-from-the-public-our-boxen). ## Integrating with Github Enterprise