Merge release branch into master branch [skip ci]

nubisproject · Apr 9, 2018 · 102277d · 102277d
2 parents 160aa29 + cd0e206
commit 102277d
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,16 @@
+sudo: required
+
+language: ruby
+
+services:
+  - docker
+
+before_install:
+  - docker pull nubisproject/nubis-travis:master
+
+script:
+  - docker run --mount type=bind,source="$(pwd)",target=/nubis/files nubisproject/nubis-travis:master
+
+notifications:
+  slack:
+    secure: lrm/1GZQ+5z9AnwDe4IuHolAxR38EEXdcPEMvt8qoSdCNxBsn2ijPSgG+wwtZRB1wW6BXcWsyGVPr8b62zGRv0D/Ie2/wu6bUddeH8n3Rxc+YfjcoYrTXAt2EKpwloG7g0CNIumfRzH+99ootn3D7NTmwQPVZMAnQGTTZ7JaK2u8fCC6eHe6ISobocEQcIzZ+vDEaNFvvbcy7sACo/nl31CNfoRmTM/rZcUqMLTATKy7+APGoHAvJvqsfLhK44fNcIky/Fx1Lu2bFX6d7VIT6UhiK/BLXSx7LGuVcx8QsWCzyG4M2dfsONumLNka8P0lmlcXVreDphKPDKNHCS6YZT7kTIlpcNBaxAWvowoJstMvxnY409pYSIJ7k7xn8Oo910jSFmZ7zYK2nKMe8DH5OprzwU6JGv0koKqw0B/s2DRmnPGL2uSMC15a7S/hfSOsiF1MHfskZl8bEZNxkDG4/9lSZ647xe8JExmef8tOhb29TDMh+GWbtQ6dSVttKuYhb9IId1UPTKL/uRpjddd6iNKmTy+dHnnslFfyQHIvmet4v/JCVtipU9hlxl8hkifitMRjdfos2W4m8PNayMcTzKUrDbnG2Ep2jquJlPzNBltYm51cwhbV0D6xhrb0qzlz4MiAcgI0YOCw9d3lvxZK9AQiYGYFsVMgbPiHb2vSs28=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,42 @@
 # Change Log
 
+## [v0.10.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.10.0) (2018-04-09)
+[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.9.0...v0.10.0)
+
+**Closed issues:**
+
+- Upgrade to Terraform 0.11.5 [\#50](https://github.com/nubisproject/nubis-docker-deploy/issues/50)
+
+**Merged pull requests:**
+
+- 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))
+
+## [v0.9.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.9.0) (2018-02-22)
+[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.8.8...v0.9.0)
+
+**Closed issues:**
+
+- Tag v0.9.0 release [\#46](https://github.com/nubisproject/nubis-docker-deploy/issues/46)
+
+**Merged pull requests:**
+
+- 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))
+
 ## [v0.8.8](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.8.8) (2018-02-15)
 [Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.7.0...v0.8.8)
 
 **Closed issues:**
 
 - Upgrade to Terraform 0.10.8 [\#39](https://github.com/nubisproject/nubis-docker-deploy/issues/39)
+- Tag v0.8.8 release [\#42](https://github.com/nubisproject/nubis-docker-deploy/issues/42)
 
 **Merged pull requests:**
 
+- 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))
 
 ## [v0.7.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.7.0) (2018-02-13)

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,13 @@
 # Docker image containing all dependencies for running terraform in Nubis
 
 FROM alpine:3.6
-MAINTAINER Jason Crowe <[email protected]>
+LABEL maintainer="Jason Crowe <[email protected]>"
 
 # Do not add a 'v' as pert of the version string (ie: v1.1.3)
 #+ This causes issues with extraction due to GitHub's methodology
 #+ Where necesary the 'v' is specified in code below
 ENV AwCliVersion=1.10.38 \
-    TerraformVersion=0.10.8 \
+    TerraformVersion=0.11.5 \
     UnicredsVersion=1.5.1 \
     Toml2JSONVersion=0.1.0
 WORKDIR /nubis

diff --git a/account-deploy b/account-deploy
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC1117
 
 STATE_REGION='eu-west-1'
 ACCOUNTS_DIR='/nubis/data/accounts'
@@ -44,7 +45,7 @@ show_help () {
     echo -en "                                New keys will be generated on the next apply\n"
     echo -en "  taint-lambda                Taint ALL lambda functions\n"
     echo -en "                                New functions will be downloaded on the next apply\n"
-    echo -en "  update                      Update Terraform modules and providors\n\n"
+    echo -en "  update                      Update Terraform modules and providers\n\n"
 }
 
 setup_account () {

diff --git a/nubis-deploy b/nubis-deploy
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC1117
 
 MOUNT_VOLUME='/nubis/data'
 WORKING_PATH='/nubis/work'
@@ -170,7 +171,7 @@ terraform-apply () {
 }
 
 terraform-do () {
-    declare -a _ACTION; _ACTION=( ${@} )
+    declare -a _ACTION; _ACTION=( "${@}" )
     cd "${TERRAFORM_PATH}" && terraform "${_ACTION[@]}"
 }