summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatthew Jones <matburt@redhat.com>2016-08-25 04:45:20 +0200
committerMatthew Jones <matburt@redhat.com>2016-08-25 04:45:20 +0200
commitc8e2f73d48abb652b7af78f0a519bfb0acbdecfd (patch)
treec998dbfbf6a00c19f47a62515a9d093aff29f54e /tools
parentInitial qpid development work (diff)
downloadawx-c8e2f73d48abb652b7af78f0a519bfb0acbdecfd.tar.xz
awx-c8e2f73d48abb652b7af78f0a519bfb0acbdecfd.zip
Support pulling the dev container image from gcr
This will be branch-relative. If you are ont he `devel` branch then it will pull that tag, it will try to pull the branch you are on and can be overridden with the COMPOSE_TAG environment variable
Diffstat (limited to 'tools')
-rw-r--r--tools/docker-compose.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index 4b79997915..5a7f744b2e 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -2,9 +2,7 @@ version: '2'
services:
# Primary Tower Development Container
tower:
- build:
- context: ..
- dockerfile: tools/docker-compose/Dockerfile
+ image: gcr.io/ansible-tower-engineering/tower_devel:${TAG}
ports:
- "8080:8080"
- "8013:8013"