diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:17:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:17:54 +0000 |
| commit | 2bf8b2986f0774911e64b2c3a1f639983a12ee89 (patch) | |
| tree | adb1dbd50c2d65de68e3acda31f44b2fe2aef35a /docker/ubuntu | |
| parent | 6a4c2b1ad0aa9f1a90b5eebbd172a6480c500a81 (diff) | |
| parent | 1a145d8a010d05762a0101bb96517eeb5cb52e29 (diff) | |
| download | kolla-2bf8b2986f0774911e64b2c3a1f639983a12ee89.tar.gz kolla-2bf8b2986f0774911e64b2c3a1f639983a12ee89.zip | |
Merge "Remove config-internal for rabbitmq"
Diffstat (limited to 'docker/ubuntu')
| -rw-r--r-- | docker/ubuntu/binary/rabbitmq/Dockerfile | 5 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/config-internal.sh | 1 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/rabbitmq-env.conf | 1 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/rabbitmq.config | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/docker/ubuntu/binary/rabbitmq/Dockerfile b/docker/ubuntu/binary/rabbitmq/Dockerfile index 4ade92668..d9df48932 100644 --- a/docker/ubuntu/binary/rabbitmq/Dockerfile +++ b/docker/ubuntu/binary/rabbitmq/Dockerfile @@ -7,8 +7,7 @@ RUN apt-get install -y --no-install-recommends \ && apt-get clean \ && /usr/lib/rabbitmq/bin/rabbitmq-plugins --offline enable rabbitmq_management -COPY rabbitmq.config rabbitmq-env.conf /etc/rabbitmq/ -COPY config-rabbit.sh config-external.sh config-internal.sh /opt/kolla/ -COPY start.sh /start.sh +COPY config-rabbit.sh config-external.sh /opt/kolla/ +COPY start.sh / CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/rabbitmq/config-internal.sh b/docker/ubuntu/binary/rabbitmq/config-internal.sh deleted file mode 120000 index 73a13c772..000000000 --- a/docker/ubuntu/binary/rabbitmq/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-internal.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/rabbitmq-env.conf b/docker/ubuntu/binary/rabbitmq/rabbitmq-env.conf deleted file mode 120000 index af9f8525e..000000000 --- a/docker/ubuntu/binary/rabbitmq/rabbitmq-env.conf +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/rabbitmq-env.conf
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/rabbitmq.config b/docker/ubuntu/binary/rabbitmq/rabbitmq.config deleted file mode 120000 index cfb088507..000000000 --- a/docker/ubuntu/binary/rabbitmq/rabbitmq.config +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/rabbitmq.config
\ No newline at end of file |