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 Apr 26, 2018
2 parents 41c2a26 + b9ad5ee commit d4caf7e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
# Change Log

## [v0.12.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.12.0) (2018-04-26)
[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.11.0...v0.12.0)

**Closed issues:**

- Upgrade to Terraform 0.11.7 [\#60](https://github.com/nubisproject/nubis-docker-deploy/issues/60)

**Merged pull requests:**

- Upgrade to Terraform 0.11.7 [\#62](https://github.com/nubisproject/nubis-docker-deploy/pull/62) ([gozer](https://github.com/gozer))

## [v0.11.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.11.0) (2018-04-10)
[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.10.0...v0.11.0)

**Closed issues:**

- Terraform 0.11.x default to input for apply [\#55](https://github.com/nubisproject/nubis-docker-deploy/issues/55)
- Tag v0.11.0 release [\#57](https://github.com/nubisproject/nubis-docker-deploy/issues/57)

**Merged pull requests:**

- 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))

## [v0.10.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.10.0) (2018-04-09)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL maintainer="Jason Crowe <[email protected]>"
#+ 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.11.5 \
TerraformVersion=0.11.7 \
UnicredsVersion=1.5.1 \
Toml2JSONVersion=0.1.0
WORKDIR /nubis
Expand Down

0 comments on commit d4caf7e

Please sign in to comment.