From 62a3e0df98ee2baf4dbeb47e4cef0a1ad7ef378c Mon Sep 17 00:00:00 2001 From: Daniel Sami Date: Wed, 5 Jun 2019 14:00:01 -0400 Subject: [PATCH] Updated docker tags in container setup Use env variable for selenium docker tag --- .env | 1 + awx/ui/test/e2e/cluster/docker-compose.debug-override.yml | 4 ++-- awx/ui/test/e2e/cluster/docker-compose.yml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.env b/.env index a906b0df7c..827440c6aa 100644 --- a/.env +++ b/.env @@ -1,2 +1,3 @@ PYTHONUNBUFFERED=true +SELENIUM_DOCKER_TAG=latest diff --git a/awx/ui/test/e2e/cluster/docker-compose.debug-override.yml b/awx/ui/test/e2e/cluster/docker-compose.debug-override.yml index 11211e9cf1..0d0a0ca3f3 100644 --- a/awx/ui/test/e2e/cluster/docker-compose.debug-override.yml +++ b/awx/ui/test/e2e/cluster/docker-compose.debug-override.yml @@ -3,9 +3,9 @@ version: '2' services: chrome: # tests are observable at vnc://localhost:secret@localhost:5900 - image: selenium/node-chrome-debug + image: selenium/node-chrome-debug:${SELENIUM_DOCKER_TAG} ports: ['5900:5900'] firefox: # tests are observable at vnc://localhost:secret@localhost:5901 - image: selenium/node-firefox-dedbug + image: selenium/node-firefox-debug:${SELENIUM_DOCKER_TAG} ports: ['5901:5900'] diff --git a/awx/ui/test/e2e/cluster/docker-compose.yml b/awx/ui/test/e2e/cluster/docker-compose.yml index b1b5377894..3c2aa5ce7e 100644 --- a/awx/ui/test/e2e/cluster/docker-compose.yml +++ b/awx/ui/test/e2e/cluster/docker-compose.yml @@ -2,13 +2,13 @@ version: '2' services: hub: - image: selenium/hub + image: selenium/hub:${SELENIUM_DOCKER_TAG} ports: - 4444:4444 environment: DBUS_SESSION_BUS_ADDRESS: /dev/null chrome: - image: selenium/node-chrome + image: selenium/node-chrome:${SELENIUM_DOCKER_TAG} links: - hub volumes: @@ -18,7 +18,7 @@ services: HUB_PORT_4444_TCP_PORT: 4444 DBUS_SESSION_BUS_ADDRESS: /dev/null firefox: - image: selenium/node-firefox + image: selenium/node-firefox:${SELENIUM_DOCKER_TAG} links: - hub environment: