Merge pull request #1 from lamoda/docker_override

Ability to use docker-compose.override for sentinel containers

.gitignore

@@ -1,5 +1,6 @@
 .php_cs.cache
 .phpunit.result.cache
 composer.lock
+docker/docker-compose.override.yml
 phpunit.xml
 /vendor/

Makefile

@@ -9,7 +9,7 @@ php-cs-fix:
 	@./vendor/bin/php-cs-fixer fix -vvv
 
 up:
-	docker-compose -f docker/docker-compose.yml up -d
+	cd docker && docker-compose up -d
 
 down:
-	docker-compose -f docker/docker-compose.yml down -v
+	cd docker && docker-compose down -v

docker/docker-compose.yml

@@ -2,30 +2,40 @@ version: '2'
 services:
   redis-master:
     image: redis:3.0-alpine
+    ports:
+      - "6379"
 
   redis-slave:
     image: redis:3.0-alpine
     command: redis-server --slaveof redis-master 6379
     links:
       - redis-master
+    ports:
+      - "6379"
 
   redis-sentinel:
     build:
       context: ./
     image: lamoda/redis-sentinel:latest
     links:
       - redis-master
+    ports:
+      - "26379"
 
   redis-sentinel2:
     image: lamoda/redis-sentinel:latest
     depends_on:
       - redis-sentinel
     links:
       - redis-master
+    ports:
+      - "26379"
 
   redis-sentinel3:
     image: lamoda/redis-sentinel:latest
     depends_on:
       - redis-sentinel
     links:
       - redis-master
+    ports:
+      - "26379"