From 2482f718f840dbea42f4c452238c5b096e1fd6b4 Mon Sep 17 00:00:00 2001 From: Ian Main Date: Mon, 15 Jun 2015 16:48:35 -0400 Subject: Set up glance to use a data container. Glance images were originally intended to be stored on the host (see container Dockerfile) but the compose file was not doing this. The right thing is to use a data container for image content. Closes-bug: #1465401 Change-Id: I02d2aab2913356939d98b8c18f9e788ae6d901af Co-Authored-By: Ryan Hallisey --- docker/centos/binary/glance/glance-api/Dockerfile | 2 -- docker/glance/glance-data/Dockerfile | 5 +++++ docker/glance/glance-data/build | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 docker/glance/glance-data/Dockerfile create mode 120000 docker/glance/glance-data/build (limited to 'docker') diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile index a4bd45bd1..5ff83508f 100644 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ b/docker/centos/binary/glance/glance-api/Dockerfile @@ -1,8 +1,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -VOLUME /var/lib/glance - ADD ./start.sh /start.sh ADD ./check.sh /check.sh diff --git a/docker/glance/glance-data/Dockerfile b/docker/glance/glance-data/Dockerfile new file mode 100644 index 000000000..e99c60eca --- /dev/null +++ b/docker/glance/glance-data/Dockerfile @@ -0,0 +1,5 @@ +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +VOLUME [ "/var/lib/glance" ] +CMD ["/bin/true"] diff --git a/docker/glance/glance-data/build b/docker/glance/glance-data/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/glance/glance-data/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file -- cgit v1.2.3