External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 06:26:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4013 from ansible/docker-container-tag-updates

Browse Source 
Updated docker tags in container setup

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-06-05 20:17:03 +00:00
committed by GitHub
parent c7f49c1193 62a3e0df98
commit 8be0b01c33
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@@ -1,2 +1,3 @@
PYTHONUNBUFFERED=true PYTHONUNBUFFERED=true
SELENIUM_DOCKER_TAG=latest

4
awx/ui/test/e2e/cluster/docker-compose.debug-override.yml
View File

@@ -3,9 +3,9 @@ version: '2'
services: services:
chrome: chrome:
# tests are observable at vnc://localhost:secret@localhost:5900 # 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'] ports: ['5900:5900']
firefox: firefox:
# tests are observable at vnc://localhost:secret@localhost:5901 # 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'] ports: ['5901:5900']

6
awx/ui/test/e2e/cluster/docker-compose.yml
View File

@@ -2,13 +2,13 @@
version: '2' version: '2'
services: services:
hub: hub:
image: selenium/hub image: selenium/hub:${SELENIUM_DOCKER_TAG}
ports: ports:
- 4444:4444 - 4444:4444
environment: environment:
DBUS_SESSION_BUS_ADDRESS: /dev/null DBUS_SESSION_BUS_ADDRESS: /dev/null
chrome: chrome:
image: selenium/node-chrome image: selenium/node-chrome:${SELENIUM_DOCKER_TAG}
links: links:
- hub - hub
volumes: volumes:
@@ -18,7 +18,7 @@ services:
HUB_PORT_4444_TCP_PORT: 4444 HUB_PORT_4444_TCP_PORT: 4444
DBUS_SESSION_BUS_ADDRESS: /dev/null DBUS_SESSION_BUS_ADDRESS: /dev/null
firefox: firefox:
image: selenium/node-firefox image: selenium/node-firefox:${SELENIUM_DOCKER_TAG}
links: links:
- hub - hub
environment: environment: