Skip to content

Commit

Permalink
Merge release branch into master branch [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Nubisproject (Mozilla) committed Jul 25, 2018
2 parents 0f45b27 + 0d4fbb9 commit d650511
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 3 deletions.
102 changes: 102 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,107 @@
# Change Log

## [v1.1.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v1.1.0) (2018-07-25)
[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.1.0...v1.1.0)

**Closed issues:**

- Tag v1.0.1 release [\#99](https://github.com/nubisproject/nubis-docker-deploy/issues/99)
- Tag v1.0.0 release [\#95](https://github.com/nubisproject/nubis-docker-deploy/issues/95)
- Tag v1.0.0 release [\#93](https://github.com/nubisproject/nubis-docker-deploy/issues/93)
- Tag v0.17.0 release [\#89](https://github.com/nubisproject/nubis-docker-deploy/issues/89)
- Tag v0.16.0 release [\#85](https://github.com/nubisproject/nubis-docker-deploy/issues/85)
- Add debugging output for terraform [\#83](https://github.com/nubisproject/nubis-docker-deploy/issues/83)
- Expose $rv to caller [\#82](https://github.com/nubisproject/nubis-docker-deploy/issues/82)
- Tag v0.15.0 release [\#79](https://github.com/nubisproject/nubis-docker-deploy/issues/79)
- Support passing arguments to deploy plan [\#77](https://github.com/nubisproject/nubis-docker-deploy/issues/77)
- Tag v0.14.0 release [\#73](https://github.com/nubisproject/nubis-docker-deploy/issues/73)
- Use json2hcl instead of toml2json [\#71](https://github.com/nubisproject/nubis-docker-deploy/issues/71)
- Tag v0.13.0 release [\#68](https://github.com/nubisproject/nubis-docker-deploy/issues/68)
- Remove hardcoded nubis domain [\#66](https://github.com/nubisproject/nubis-docker-deploy/issues/66)
- Tag v0.12.0 release [\#63](https://github.com/nubisproject/nubis-docker-deploy/issues/63)
- Upgrade to Terraform 0.11.7 [\#60](https://github.com/nubisproject/nubis-docker-deploy/issues/60)
- Tag v0.11.0 release [\#57](https://github.com/nubisproject/nubis-docker-deploy/issues/57)
- Terraform 0.11.x default to input for apply [\#55](https://github.com/nubisproject/nubis-docker-deploy/issues/55)
- Tag v0.10.0 release [\#52](https://github.com/nubisproject/nubis-docker-deploy/issues/52)
- Upgrade to Terraform 0.11.5 [\#50](https://github.com/nubisproject/nubis-docker-deploy/issues/50)
- Tag v0.9.0 release [\#46](https://github.com/nubisproject/nubis-docker-deploy/issues/46)
- Tag v0.8.8 release [\#42](https://github.com/nubisproject/nubis-docker-deploy/issues/42)
- Upgrade to Terraform 0.10.8 [\#39](https://github.com/nubisproject/nubis-docker-deploy/issues/39)
- Tag v0.7.0 release [\#36](https://github.com/nubisproject/nubis-docker-deploy/issues/36)
- Tag v0.6.0 release [\#32](https://github.com/nubisproject/nubis-docker-deploy/issues/32)
- Tag v0.5.0 release [\#28](https://github.com/nubisproject/nubis-docker-deploy/issues/28)
- Tag v0.5.0633950 release [\#27](https://github.com/nubisproject/nubis-docker-deploy/issues/27)
- Refactor Dockerfile [\#25](https://github.com/nubisproject/nubis-docker-deploy/issues/25)
- Check to see if a state.tf file exists [\#22](https://github.com/nubisproject/nubis-docker-deploy/issues/22)
- Self determine app state bucket location without having to read public state [\#18](https://github.com/nubisproject/nubis-docker-deploy/issues/18)
- Tag v0.4.0 release [\#15](https://github.com/nubisproject/nubis-docker-deploy/issues/15)
- \[terraform\] Upgrade to 0.10.7 [\#11](https://github.com/nubisproject/nubis-docker-deploy/issues/11)
- Tag v0.3.0 release [\#8](https://github.com/nubisproject/nubis-docker-deploy/issues/8)
- Use toml2json to parse terraform tf vars files [\#5](https://github.com/nubisproject/nubis-docker-deploy/issues/5)
- Tag v0.2.0 release [\#2](https://github.com/nubisproject/nubis-docker-deploy/issues/2)

**Merged pull requests:**

- Expose ability to use custom domain [\#102](https://github.com/nubisproject/nubis-docker-deploy/pull/102) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.0.1 release \[skip ci\] [\#101](https://github.com/nubisproject/nubis-docker-deploy/pull/101) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v1.0.1 release \[skip ci\] [\#100](https://github.com/nubisproject/nubis-docker-deploy/pull/100) ([nubis-automation](https://github.com/nubis-automation))
- Also add region/arena/env to uploaded assets [\#98](https://github.com/nubisproject/nubis-docker-deploy/pull/98) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.0.0 release \[skip ci\] [\#97](https://github.com/nubisproject/nubis-docker-deploy/pull/97) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v1.0.0 release \[skip ci\] [\#96](https://github.com/nubisproject/nubis-docker-deploy/pull/96) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v1.0.0 release \[skip ci\] [\#94](https://github.com/nubisproject/nubis-docker-deploy/pull/94) ([nubis-automation](https://github.com/nubis-automation))
- Add region/arena/environment to S3 path [\#92](https://github.com/nubisproject/nubis-docker-deploy/pull/92) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.17.0 release \[skip ci\] [\#91](https://github.com/nubisproject/nubis-docker-deploy/pull/91) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.17.0 release \[skip ci\] [\#90](https://github.com/nubisproject/nubis-docker-deploy/pull/90) ([nubis-automation](https://github.com/nubis-automation))
- Work around AWS S333diocy [\#88](https://github.com/nubisproject/nubis-docker-deploy/pull/88) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.16.0 release \[skip ci\] [\#87](https://github.com/nubisproject/nubis-docker-deploy/pull/87) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.16.0 release \[skip ci\] [\#86](https://github.com/nubisproject/nubis-docker-deploy/pull/86) ([nubis-automation](https://github.com/nubis-automation))
- Carry $rv through and add Terraform debug support [\#84](https://github.com/nubisproject/nubis-docker-deploy/pull/84) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.15.0 release \[skip ci\] [\#81](https://github.com/nubisproject/nubis-docker-deploy/pull/81) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.15.0 release \[skip ci\] [\#80](https://github.com/nubisproject/nubis-docker-deploy/pull/80) ([nubis-automation](https://github.com/nubis-automation))
- Enable tty autodetection [\#78](https://github.com/nubisproject/nubis-docker-deploy/pull/78) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.14.0 release \[skip ci\] [\#75](https://github.com/nubisproject/nubis-docker-deploy/pull/75) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.14.0 release \[skip ci\] [\#74](https://github.com/nubisproject/nubis-docker-deploy/pull/74) ([nubis-automation](https://github.com/nubis-automation))
- \[please test\] Convert to json2hcl [\#72](https://github.com/nubisproject/nubis-docker-deploy/pull/72) ([limed](https://github.com/limed))
- Update CHANGELOG for v0.13.0 release \[skip ci\] [\#70](https://github.com/nubisproject/nubis-docker-deploy/pull/70) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.13.0 release \[skip ci\] [\#69](https://github.com/nubisproject/nubis-docker-deploy/pull/69) ([nubis-automation](https://github.com/nubis-automation))
- Add requirements for working with kubernetes [\#67](https://github.com/nubisproject/nubis-docker-deploy/pull/67) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.12.0 release \[skip ci\] [\#65](https://github.com/nubisproject/nubis-docker-deploy/pull/65) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.12.0 release \[skip ci\] [\#64](https://github.com/nubisproject/nubis-docker-deploy/pull/64) ([nubis-automation](https://github.com/nubis-automation))
- Upgrade to Terraform 0.11.7 [\#62](https://github.com/nubisproject/nubis-docker-deploy/pull/62) ([gozer](https://github.com/gozer))
- Update CHANGELOG for v0.11.0 release \[skip ci\] [\#59](https://github.com/nubisproject/nubis-docker-deploy/pull/59) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.11.0 release \[skip ci\] [\#58](https://github.com/nubisproject/nubis-docker-deploy/pull/58) ([nubis-automation](https://github.com/nubis-automation))
- Run TF apply with -auto-approve=true [\#56](https://github.com/nubisproject/nubis-docker-deploy/pull/56) ([gozer](https://github.com/gozer))
- Update CHANGELOG for v0.10.0 release \[skip ci\] [\#54](https://github.com/nubisproject/nubis-docker-deploy/pull/54) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.10.0 release \[skip ci\] [\#53](https://github.com/nubisproject/nubis-docker-deploy/pull/53) ([nubis-automation](https://github.com/nubis-automation))
- Upgrade to Terraform 0.11.5 [\#51](https://github.com/nubisproject/nubis-docker-deploy/pull/51) ([gozer](https://github.com/gozer))
- Fixing typo [\#49](https://github.com/nubisproject/nubis-docker-deploy/pull/49) ([limed](https://github.com/limed))
- Add travis checks and a few lint fixups [\#48](https://github.com/nubisproject/nubis-docker-deploy/pull/48) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.9.0 release \[skip ci\] [\#47](https://github.com/nubisproject/nubis-docker-deploy/pull/47) ([nubis-automation](https://github.com/nubis-automation))
- Add show and taint to account subcommand [\#45](https://github.com/nubisproject/nubis-docker-deploy/pull/45) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.8.8 release \[skip ci\] [\#44](https://github.com/nubisproject/nubis-docker-deploy/pull/44) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.8.8 release \[skip ci\] [\#43](https://github.com/nubisproject/nubis-docker-deploy/pull/43) ([nubis-automation](https://github.com/nubis-automation))
- Upgrade to Terraform 0.10.8 [\#41](https://github.com/nubisproject/nubis-docker-deploy/pull/41) ([gozer](https://github.com/gozer))
- Update CHANGELOG for v0.7.0 release \[skip ci\] [\#38](https://github.com/nubisproject/nubis-docker-deploy/pull/38) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.7.0 release \[skip ci\] [\#37](https://github.com/nubisproject/nubis-docker-deploy/pull/37) ([nubis-automation](https://github.com/nubis-automation))
- Add account operations to the docker image [\#35](https://github.com/nubisproject/nubis-docker-deploy/pull/35) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.6.0 release \[skip ci\] [\#34](https://github.com/nubisproject/nubis-docker-deploy/pull/34) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.6.0 release \[skip ci\] [\#33](https://github.com/nubisproject/nubis-docker-deploy/pull/33) ([nubis-automation](https://github.com/nubis-automation))
- Convert to alpine linux [\#31](https://github.com/nubisproject/nubis-docker-deploy/pull/31) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.5.0 release \[skip ci\] [\#30](https://github.com/nubisproject/nubis-docker-deploy/pull/30) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v0.5.0 release \[skip ci\] [\#29](https://github.com/nubisproject/nubis-docker-deploy/pull/29) ([nubis-automation](https://github.com/nubis-automation))
- Dockerfile refactor [\#26](https://github.com/nubisproject/nubis-docker-deploy/pull/26) ([limed](https://github.com/limed))
- App state bucket discovery [\#24](https://github.com/nubisproject/nubis-docker-deploy/pull/24) ([limed](https://github.com/limed))
- Checking if state.tf file exists [\#23](https://github.com/nubisproject/nubis-docker-deploy/pull/23) ([limed](https://github.com/limed))
- Merge v0.4.0 release into develop. \[skip ci\] [\#17](https://github.com/nubisproject/nubis-docker-deploy/pull/17) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.4.0 release \[skip ci\] [\#16](https://github.com/nubisproject/nubis-docker-deploy/pull/16) ([tinnightcap](https://github.com/tinnightcap))
- Updates for Nubis v2.0.1 [\#14](https://github.com/nubisproject/nubis-docker-deploy/pull/14) ([tinnightcap](https://github.com/tinnightcap))
- Upgrade to Terraform 0.10.7 [\#13](https://github.com/nubisproject/nubis-docker-deploy/pull/13) ([gozer](https://github.com/gozer))
- Merge v0.3.0 release into develop. \[skip ci\] [\#10](https://github.com/nubisproject/nubis-docker-deploy/pull/10) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.3.0 release \[skip ci\] [\#9](https://github.com/nubisproject/nubis-docker-deploy/pull/9) ([tinnightcap](https://github.com/tinnightcap))
- New features [\#7](https://github.com/nubisproject/nubis-docker-deploy/pull/7) ([tinnightcap](https://github.com/tinnightcap))
- Merge v0.2.0 release into develop. \[skip ci\] [\#4](https://github.com/nubisproject/nubis-docker-deploy/pull/4) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v0.2.0 release \[skip ci\] [\#3](https://github.com/nubisproject/nubis-docker-deploy/pull/3) ([tinnightcap](https://github.com/tinnightcap))

## [v1.0.1](https://github.com/nubisproject/nubis-docker-deploy/tree/v1.0.1) (2018-07-16)
[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v1.0.0...v1.0.1)

Expand Down
10 changes: 7 additions & 3 deletions nubis-deploy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ show_help () {
echo -en "\nUsage:docker run --interactive --tty --env-file ~/.docker_env -v $PWD:/nubis/data nubis-deploy [command]\n\n"
echo -en "Commands:\n"
echo -en " --help Print this help message\n"
echo -en " --domain Set domain for looking up state (Default: nubis.allizom.org)\n"
echo -en " --skip-init Skip Terraform initialization\n"
echo -en " Must be used with a volume mount only after initial run\n"
echo -en " plan Show the deployment plan\n"
Expand Down Expand Up @@ -92,12 +93,12 @@ setup-terraform () {
else
export SERVICE_NAME
fi
STATE_BUCKET=$(curl -s "http://state.nubis.${ACCOUNT}.nubis.allizom.org/aws/${DEPLOYMENT_REGION}/${ARENA}.tfstate" | \
STATE_BUCKET=$(curl -s "http://state.nubis.${ACCOUNT}.${NUBIS_DOMAIN:-'nubis.allizom.org'}/aws/${DEPLOYMENT_REGION}/${ARENA}.tfstate" | \
jq -r ' .modules[] | select(.path == ["root"]) | .outputs.apps_state_bucket')
# Make sure we have a state bucket
if [ "${STATE_BUCKET}" == 'null' ] || [ -z "${STATE_BUCKET}" ]; then
echo -e "\033[1;32mWARNING: Could not find state bucket in account '${ARENA}.tfstate' file using:\033[0m"
echo -e "\033[1;32mWARNING: 'curl -s \"http://state.nubis.${ACCOUNT}.nubis.allizom.org/aws/${DEPLOYMENT_REGION}/${ARENA}.tfstate\"'\033[0m"
echo -e "\033[1;32mWARNING: 'curl -s \"http://state.nubis.${ACCOUNT}.${NUBIS_DOMAIN:-'nubis.allizom.org'}/aws/${DEPLOYMENT_REGION}/${ARENA}.tfstate\"'\033[0m"

# Default checking state bucket using awscli
echo -e "\033[0;32mWARNING: Defaulting state bucket discovery in S3 using awscli\033[0m"
Expand Down Expand Up @@ -251,7 +252,10 @@ while [ "$1" != "" ]; do
NUBIS_ACCOUNT="$2"
shift
;;

-d | --domain )
NUBIS_DOMAIN="${2}"
shift
;;
account )
shift
if [ "${#@}" == 0 ]; then
Expand Down

0 comments on commit d650511

Please sign in to comment.