From 1f1025b35c3eaf409e14eb6b09d6cf323ed17c3d Mon Sep 17 00:00:00 2001 From: Cole Kettler Date: Wed, 25 Mar 2020 18:03:19 -0400 Subject: [PATCH] Upgrade ansible-docker, Docker, and Docker Compose (#800) * 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 --- CHANGELOG.md | 1 + deployment/ansible/group_vars/all.example | 5 ++--- deployment/ansible/roles.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5607f6aa..f8e61ebf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/deployment/ansible/group_vars/all.example b/deployment/ansible/group_vars/all.example index eab1408e..96f19c74 100644 --- a/deployment/ansible/group_vars/all.example +++ b/deployment/ansible/group_vars/all.example @@ -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 diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml index 5763fe98..b04fe7db 100644 --- a/deployment/ansible/roles.yml +++ b/deployment/ansible/roles.yml @@ -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