From 1a145d8a010d05762a0101bb96517eeb5cb52e29 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 7 Aug 2015 17:44:01 +0000 Subject: Remove config-internal for rabbitmq Change-Id: Ifd8fc361d8a7e278134f671910e8c122c9842386 Partially-Implements: blueprint remove-config-internal --- docker/ubuntu/binary/rabbitmq/Dockerfile | 5 ++--- docker/ubuntu/binary/rabbitmq/config-internal.sh | 1 - docker/ubuntu/binary/rabbitmq/rabbitmq-env.conf | 1 - docker/ubuntu/binary/rabbitmq/rabbitmq.config | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 120000 docker/ubuntu/binary/rabbitmq/config-internal.sh delete mode 120000 docker/ubuntu/binary/rabbitmq/rabbitmq-env.conf delete mode 120000 docker/ubuntu/binary/rabbitmq/rabbitmq.config (limited to 'docker/ubuntu/binary') 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 -- cgit v1.2.3