attempt to update to tox docker 2.0txdocker2

1 files changed, 7 insertions, 5 deletions

diff --git a/tox.ini b/tox.ini
index ecea1b16..a0c408aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ envlist =
     apicheck
     pydocstyle
 
-requires = tox-docker
+requires = tox-docker>=2.0
 
 [testenv]
 sitepackages = False
@@ -38,14 +38,15 @@ basepython =
 install_command = python -m pip --disable-pip-version-check install {opts} {packages}
 
 docker =
-    integration-py-amqp: rabbitmq:alpine
-    integration-redis: redis:alpine
+    integration-py-amqp: rabbitmq
+    integration-redis: redis
 
 dockerenv =
     PYAMQP_INTEGRATION_INSTANCE=1
     RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit tcp_listeners [5672]
 
-[docker:rabbitmq:alpine]
+[docker:rabbitmq]
+image = rabbitmq
 ports = 5672:5672/tcp
 healthcheck_cmd = /bin/bash -c 'rabbitmq-diagnostics ping -q'
 healthcheck_interval = 10
@@ -53,7 +54,8 @@ healthcheck_timeout = 10
 healthcheck_retries = 30
 healthcheck_start_period = 5
 
-[docker:redis:alpine]
+[docker:redis]
+image = redis
 ports = 6379:6379/tcp
 healthcheck_cmd = /bin/sh -c 'redis-cli ping'
 healthcheck_interval = 10