Merge pull request #18141 from tback/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-06 11:56:00 -08:00
commit 0e3f9625c8

View File

@ -5,7 +5,6 @@ RUN apt-get install -yy -q python
COPY redis-master.conf /redis-master/redis.conf
COPY redis-slave.conf /redis-slave/redis.conf
COPY run.sh /run.sh
COPY sentinel.py /sentinel.py
CMD [ "/run.sh" ]
ENTRYPOINT [ "sh", "-c" ]