Skip to content

Commit

Permalink
Upgrade ansible-docker, Docker, and Docker Compose (#800)
Browse files Browse the repository at this point in the history
* Upgrade ansible-docker module to 5.0.0, Docker to 18.*, Docker Compose to 1.23.*

* Update CHANGELOG with Docker and Docker Compose version upgrades
  • Loading branch information
colekettler authored Mar 25, 2020
1 parent 74dd46f commit 1f1025b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

#### Changed
- Upgraded Django and psycopg2 package versions and switched to psycopg2-binary
- Upgraded ansible-docker module to 5.0.0, Docker to 18.*, and Docker Compose to 1.23.*
- Fix lane handling in analysis
- Fix population scores for destinations in analysis
- Add favicon
Expand Down
5 changes: 2 additions & 3 deletions deployment/ansible/group_vars/all.example
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ pfb_aws_batch_analysis_job_queue_name: "name_of_batch_analysis_job_queue"
pfb_aws_batch_analysis_job_definition_name: "staging-pfb-analysis-run-job"

# azavea.docker
# 1.12.* to match AWS ECS
docker_version: 1.12.*
docker_version: 18.*
docker_options: "--storage-opt dm.basesize=20G"
docker_compose_version: 1.9.0
docker_compose_version: 1.23.*

# azavea.terraform
terraform_version: 0.9.3
2 changes: 1 addition & 1 deletion deployment/ansible/roles.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- src: azavea.aws-cli
version: 0.1.0
- src: azavea.docker
version: 3.0.0
version: 5.0.0
- src: azavea.terraform
version: 0.3.1

0 comments on commit 1f1025b

Please sign in to comment.