diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-15 01:11:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-15 01:11:59 +0000 |
| commit | 457d97087656f7837ff948b39d7b7e7f976170e3 (patch) | |
| tree | af0a720de58ee9799c919047614f37b204cc54c7 | |
| parent | eb89d91f0d9e8f63417727e47cb924292658115f (diff) | |
| parent | 02bb5f90001e5415c156a58a6e6caa0283bc7d3b (diff) | |
| download | kolla-457d97087656f7837ff948b39d7b7e7f976170e3.tar.gz kolla-457d97087656f7837ff948b39d7b7e7f976170e3.zip | |
Merge "Add Dockerfile template for glance"
7 files changed, 49 insertions, 0 deletions
diff --git a/docker_templates/glance/glance-api/Dockerfile.j2 b/docker_templates/glance/glance-api/Dockerfile.j2 new file mode 100644 index 000000000..f652822f5 --- /dev/null +++ b/docker_templates/glance/glance-api/Dockerfile.j2 @@ -0,0 +1,7 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +COPY start.sh / +COPY config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh new file mode 120000 index 000000000..4261b90e1 --- /dev/null +++ b/docker_templates/glance/glance-api/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/glance/glance-api/config-external.sh
\ No newline at end of file diff --git a/docker_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh new file mode 120000 index 000000000..395aafe82 --- /dev/null +++ b/docker_templates/glance/glance-api/start.sh @@ -0,0 +1 @@ +../../../docker/common/glance/glance-api/start.sh
\ No newline at end of file diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker_templates/glance/glance-base/Dockerfile.j2 new file mode 100644 index 000000000..1a092f1a7 --- /dev/null +++ b/docker_templates/glance/glance-base/Dockerfile.j2 @@ -0,0 +1,31 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +{% if install_type == 'binary' %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + +RUN yum -y install \ + openstack-glance \ + python-oslo-i18n \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} +{% elif install_type == 'source' %} + +ADD ./glance.tar / +RUN ln -s /glance-* /glance + +RUN cd /glance \ + && useradd --user-group glance \ + && pip install -r requirements.txt \ + && pip install /glance \ + && mkdir /etc/glance /var/log/glance \ + && cp -r /glance/etc/* /etc/glance/ \ + && rm -rf /root/.cache + +{% endif %} diff --git a/docker_templates/glance/glance-registry/Dockerfile.j2 b/docker_templates/glance/glance-registry/Dockerfile.j2 new file mode 100644 index 000000000..f652822f5 --- /dev/null +++ b/docker_templates/glance/glance-registry/Dockerfile.j2 @@ -0,0 +1,7 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +COPY start.sh / +COPY config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker_templates/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh new file mode 120000 index 000000000..c652dc476 --- /dev/null +++ b/docker_templates/glance/glance-registry/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/glance/glance-registry/config-external.sh
\ No newline at end of file diff --git a/docker_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh new file mode 120000 index 000000000..72d1278ab --- /dev/null +++ b/docker_templates/glance/glance-registry/start.sh @@ -0,0 +1 @@ +../../../docker/common/glance/glance-registry/start.sh
\ No newline at end of file |