diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-13 14:26:55 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-18 20:52:27 -0700 |
| commit | bd5e5bbb64b20eb4c77c2a941973845d847e9d78 (patch) | |
| tree | 7099996ec8aec66ce16d78f97e79c8ca76df5b44 /docker/centos/binary | |
| parent | ac61653343536017b20182e75bc66228bc4da79f (diff) | |
| download | kolla-bd5e5bbb64b20eb4c77c2a941973845d847e9d78.tar.gz kolla-bd5e5bbb64b20eb4c77c2a941973845d847e9d78.zip | |
Use one data container for all data volumes
The previous method of using the API image for a data container
worked, but resulted in more data being bindmounted and copied
into the system. This patch resolves that by essentially using
a distro-type as a FROM in a Dockerfile to generate
distro-type-data. Further all of the data containers used
throughout ansible are modified to use this new data container.
Change-Id: I8846573d4f2d4b98d4f46c770bfefc6d4c5cd0b5
Partially-Implements: blueprint one-data-container
Diffstat (limited to 'docker/centos/binary')
| -rw-r--r-- | docker/centos/binary/data/Dockerfile | 4 | ||||
| l--------- | docker/centos/binary/data/build | 1 | ||||
| -rw-r--r-- | docker/centos/binary/galera/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/centos/binary/rabbitmq/Dockerfile | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/docker/centos/binary/data/Dockerfile b/docker/centos/binary/data/Dockerfile new file mode 100644 index 000000000..635918540 --- /dev/null +++ b/docker/centos/binary/data/Dockerfile @@ -0,0 +1,4 @@ +FROM centos +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +CMD /bin/sleep infinity diff --git a/docker/centos/binary/data/build b/docker/centos/binary/data/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/centos/binary/data/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/galera/Dockerfile b/docker/centos/binary/galera/Dockerfile index e4171165b..9a21c3440 100644 --- a/docker/centos/binary/galera/Dockerfile +++ b/docker/centos/binary/galera/Dockerfile @@ -19,7 +19,8 @@ RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \ percona-xtrabackup \ pv \ tar \ - expect + expect \ + && rm -rf /var/lib/mysql/* COPY config-galera.sh /opt/kolla/config/ COPY config-external.sh /opt/kolla/ diff --git a/docker/centos/binary/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile index 51197ca43..88894c3c7 100644 --- a/docker/centos/binary/rabbitmq/Dockerfile +++ b/docker/centos/binary/rabbitmq/Dockerfile @@ -5,7 +5,8 @@ RUN yum -y install \ hostname \ rabbitmq-server && \ yum clean all && \ - /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management + /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management \ + && rm -rf /var/lib/rabbitmq/* COPY config-rabbit.sh config-external.sh /opt/kolla/ COPY start.sh / |