Skip to content

Commit

Permalink
Merge pull request kubernetes#18141 from tback/master
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Dec 6, 2015
2 parents dca6f5a + c022bd0 commit 0e3f962
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion examples/redis/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

0 comments on commit 0e3f962

Please sign in to comment.