Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
This commit is contained in:
Matthew Jones
2016-07-07 12:40:10 -04:00
parent 22437f80ed
commit 6b73fb2c27
321 changed files with 8400 additions and 8261 deletions

View File

@@ -1,37 +1,26 @@
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
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"