diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:49:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:49:53 +0000 |
| commit | 6a622ec82c2c63bfe08d6432ce39c2ece18ccbbe (patch) | |
| tree | e3c4b7312e7bf0ce65ae3d1e5be25b44b16a97fe /docker/designate | |
| parent | fea0f07c089683c9a1061833fa2533f994fe9198 (diff) | |
| parent | 0e99b69de48c1deb7f6f1f707e78f445caa5c3d0 (diff) | |
| download | kolla-6a622ec82c2c63bfe08d6432ce39c2ece18ccbbe.tar.gz kolla-6a622ec82c2c63bfe08d6432ce39c2ece18ccbbe.zip | |
Merge "Implement a install_type and install_metatype"
Diffstat (limited to 'docker/designate')
7 files changed, 7 insertions, 7 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 1e2e28e8f..f0b8ea6cf 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 3b47ff72e..f163c7b98 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index b12fa013b..09ddb4e75 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 3c4309999..01ddbbfd0 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 49d7fa781..fdb2d0c1d 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 index 35f99c2bf..1d8df60ad 100644 --- a/docker/designate/designate-poolmanager/Dockerfile.j2 +++ b/docker/designate/designate-poolmanager/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 1d52a282b..bc4fa45c9 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} |