From 096719d759906ba41b8bb5c8485b6495db26cf96 Mon Sep 17 00:00:00 2001 From: Peter Souter Date: Thu, 1 Feb 2018 17:55:35 +0000 Subject: [PATCH] Add Bitbucket/Stash instructions --- README.md | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 507c07d..6624a9f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ Table of Contents * [What You Get From This control\-repo](#what-you-get-from-this-control-repo) * [Copy This Repo Into Your Own Git Server](#copy-this-repo-into-your-own-git-server) * [GitLab](#gitlab) - * [Stash](#stash) - * [GitHub](#github) + * [Bitbucket/Stash](#Bitbucket/Stash) + * [Github](#github) Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc.go) @@ -65,9 +65,33 @@ The major points are: 11. Push the production branch of the repository from your machine up to your git server - `git push origin production` -### Stash +### Bitbucket/Stash -Coming soon! +1. Install Bitbucket + - https://www.atlassian.com/software/bitbucket/download + +1. Make a `Project` called `puppet` (with a short name of `PUP`) + +1. Create a repository called `control-repo` + +1. * Create a user called `r10k` with a password of `puppet`. + * Make the r10k user an admin of the `PUP` project. + +1. Either use the admin user to test pushing code, or create a user for yourself and add your SSH key to that user. + * If making a user for yourself, give your user account read/write or admin privilege to the `PUP` project. + +1. Clone this control repository to your laptop/workstation + - `git clone ` + - `cd control-repo` + +1. Remove this repository as the origin remote + - `git remote remove origin` + +1. Add your internal repository as the origin remote + - `git remote add origin ` + +1. Push the production branch of the repository from your machine up to your git server + - `git push origin production` ### GitHub