diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-13 20:18:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-13 20:18:00 +0000 |
| commit | 39df04381f745eb6f1634e4db46a0a09418b7df3 (patch) | |
| tree | cb762161d011768c43b9a8fc52462c8aab5e3507 /docker | |
| parent | a6a936dd6fbf51f914c6ebe7bf3b8f7aa832f1fe (diff) | |
| parent | 05b4364cbb97591b12b944ee82da7532c5c32b92 (diff) | |
| download | kolla-39df04381f745eb6f1634e4db46a0a09418b7df3.tar.gz kolla-39df04381f745eb6f1634e4db46a0a09418b7df3.zip | |
Merge "normalize start script name for rabbitmq"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/rabbitmq/start.sh (renamed from docker/rabbitmq/init-rabbitmq.sh) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index 32b1c71ae..925bc6960 100644 --- a/docker/rabbitmq/Dockerfile +++ b/docker/rabbitmq/Dockerfile @@ -4,5 +4,5 @@ MAINTAINER Lars Kellogg-Stedman <lars@redhat.com> RUN yum -y install rabbitmq-server; yum clean all ADD rabbitmq.config /etc/rabbitmq/ ADD rabbitmq-env.conf /etc/rabbitmq/ -ADD init-rabbitmq.sh /start.sh +ADD start.sh /start.sh CMD ["/start.sh"] diff --git a/docker/rabbitmq/init-rabbitmq.sh b/docker/rabbitmq/start.sh index be69af7d5..be69af7d5 100755 --- a/docker/rabbitmq/init-rabbitmq.sh +++ b/docker/rabbitmq/start.sh |