diff --git a/CHANGELOG.md b/CHANGELOG.md index 600c5cf..b1f2da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,23 @@ # Change Log +## [v2.0.3](https://github.com/nubisproject/nubis-docs/tree/v2.0.3) (2017-11-02) +[Full Changelog](https://github.com/nubisproject/nubis-docs/compare/v2.0.2...v2.0.3) + +**Merged pull requests:** + +- PREREQs docs fix [\#219](https://github.com/nubisproject/nubis-docs/pull/219) ([cvalaas](https://github.com/cvalaas)) + ## [v2.0.2](https://github.com/nubisproject/nubis-docs/tree/v2.0.2) (2017-10-24) [Full Changelog](https://github.com/nubisproject/nubis-docs/compare/v2.0.1...v2.0.2) +**Closed issues:** + +- Tag v2.0.2 release [\#216](https://github.com/nubisproject/nubis-docs/issues/216) + **Merged pull requests:** +- Merge v2.0.2 release into develop. \[skip ci\] [\#218](https://github.com/nubisproject/nubis-docs/pull/218) ([tinnightcap](https://github.com/tinnightcap)) +- Update CHANGELOG for v2.0.2 release \[skip ci\] [\#217](https://github.com/nubisproject/nubis-docs/pull/217) ([tinnightcap](https://github.com/tinnightcap)) - Update versions for docker images [\#215](https://github.com/nubisproject/nubis-docs/pull/215) ([tinnightcap](https://github.com/tinnightcap)) ## [v2.0.1](https://github.com/nubisproject/nubis-docs/tree/v2.0.1) (2017-10-13) diff --git a/PREREQUISITES.md b/PREREQUISITES.md index e3a2930..0196117 100644 --- a/PREREQUISITES.md +++ b/PREREQUISITES.md @@ -218,7 +218,7 @@ To test that everything has been set up correctly, run the following command: ```bash -vault-exec aws ec2 describe-regions +aws-vault exec -n ${ACCOUNT_NAME}-admin -- aws ec2 describe-regions ``` @@ -254,6 +254,14 @@ aws-vault --debug login ${ACCOUNT_NAME}-ro ``` +For future convenience, add this to your .bashrc: + +```bash + +alias vault-exec="aws-vault exec ${ACCOUNT_NAME}-admin --" + +``` + ## nubis-builder This is a Docker image we built to drive Packer. The embedded tools greatly @@ -356,7 +364,7 @@ deploy: ```bash -vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.5.0 +vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.7.0 ``` @@ -387,8 +395,8 @@ the nubis-skel application into the account. ```bash -vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.3.0 plan -vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.3.0 apply +vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.4.0 plan +vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.4.0 apply ``` @@ -408,7 +416,7 @@ To finish up, remove your application from the training account: ```bash -vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.3.0 destroy +vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.4.0 destroy ``` diff --git a/PUPPET.md b/PUPPET.md index 239ac8c..a5076f6 100644 --- a/PUPPET.md +++ b/PUPPET.md @@ -4,7 +4,7 @@ We use [Packer](http://packer.io) to build our system images, but under the hood we use puppet-masterless to do the heavy lifting. First, let's be clear, you do not have to use puppet at all to build images, you -could simply rely on packer's provisionners, copying files to the image and +could simply rely on packer's provisioners, copying files to the image and running arbitrary shell commands. However, that is not the recommended mechanism to deliver quality Nubis images. diff --git a/dashboard/cheat-sheet.md b/dashboard/cheat-sheet.md index 77556ea..96cdf08 100644 --- a/dashboard/cheat-sheet.md +++ b/dashboard/cheat-sheet.md @@ -29,7 +29,7 @@ NUBIS_DOCKER=( 'docker' 'run' \ ```bash -vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.5.0 +vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.7.0 ``` @@ -41,10 +41,10 @@ sshuttle -v --dns -r \ @jumphost.stage.us-west-2.nubis-training.nubis.allizom.org \ 10.164.19.0/24 -vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.3.0 plan +vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.4.0 plan -vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.3.0 apply +vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.4.0 apply -vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.3.0 destroy +vault-exec "${NUBIS_DOCKER[@]}" nubisproject/nubis-deploy:v0.4.0 destroy ```