diff options
author | Matthew Jones <matburt@redhat.com> | 2016-06-08 18:25:14 +0200 |
---|---|---|
committer | Matthew Jones <matburt@redhat.com> | 2016-06-08 18:25:14 +0200 |
commit | 20fe9e96140037ebe093a0e9e95977d4d0f7305c (patch) | |
tree | e0839fd410b7a315f9e7e1cb8bb6a918effcdc0e /tools/docker-compose.yml | |
parent | Fix Inventory Manage > Inventory Sync schedules > add/edit (#2220) (diff) | |
download | awx-20fe9e96140037ebe093a0e9e95977d4d0f7305c.tar.xz awx-20fe9e96140037ebe093a0e9e95977d4d0f7305c.zip |
Updating docker dev workflow
* Moving to new docker compose file format
* Adding some things that will be needed for python dependencies
Diffstat (limited to 'tools/docker-compose.yml')
-rw-r--r-- | tools/docker-compose.yml | 63 |
1 files changed, 37 insertions, 26 deletions
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index 4b506c4f36..69a9393ed3 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -1,26 +1,37 @@ -tower: - build: ./docker-compose - ports: - - "8080:8080" - - "8013:8013" - links: - - postgres - - redis - - graphite - volumes: - - ../:/tower_devel -postgres: - image: postgres:9.4.1 - # ports: - # - 5432:5432 -redis: - image: redis:3.0.1 - # ports: - # - 6379:6379 -graphite: - image: hopsoft/graphite-statsd - ports: - - "8001:80" - - "2003:2003" - - "8125:8125/udp" - - "8126:8126" +version: '2' +services: + # Primary Tower Development Container + tower: + build: ./docker-compose + ports: + - "8080:8080" + - "8013:8013" + links: + - postgres + - redis + # - sync + # volumes_from: + # - sync + volumes: + - "../:/tower_devel" + + # Postgres Database Container + postgres: + image: postgres:9.4.1 + + # Redis Container + redis: + image: redis:3.0.1 + + # Source Code Synchronization Container + # sync: + # build: + # context: ./docker-compose + # dockerfile: Dockerfile-sync + # command: "lsyncd -delay 1 -nodaemon -rsync /src /tower_devel" + # volumes: + # - /tower_devel + # - "../:/src" + # working_dir: /src + # stdin_open: true + # tty: true |