aboutsummaryrefslogtreecommitdiff
path: root/docker/designate
diff options
context:
space:
mode:
Diffstat (limited to 'docker/designate')
-rw-r--r--docker/designate/designate-api/Dockerfile.j22
-rw-r--r--docker/designate/designate-backend-bind9/Dockerfile.j24
-rw-r--r--docker/designate/designate-base/Dockerfile.j24
-rw-r--r--docker/designate/designate-central/Dockerfile.j22
-rw-r--r--docker/designate/designate-mdns/Dockerfile.j22
-rw-r--r--docker/designate/designate-pool-manager/Dockerfile.j22
-rw-r--r--docker/designate/designate-sink/Dockerfile.j22
7 files changed, 9 insertions, 9 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 893612e84..9a69e9b28 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set designate_api_packages = ['designate-api'] %}
{% endif %}
-RUN {{ macros.install_packages(designate_api_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_api_packages | customizable("packages")) }}
{% endif %}
{% block designate_api_footer %}{% endblock %}
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 53b0672c2..975d82c37 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -6,14 +6,14 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set designate_backend_bind9_packages = ['bind'] %}
-RUN {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
RUN mkdir -p /var/lib/kolla/ \
&& cp -pr /var/named /var/lib/kolla/var-named
{% elif base_distro in ['ubuntu'] %}
{% set designate_backend_bind9_packages = ['bind9'] %}
-RUN {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% endif %}
{% endif %}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 3fccb13ea..2ae661d05 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -17,7 +17,7 @@ MAINTAINER {{ maintainer }}
'python2-suds'
] %}
-RUN {{ macros.install_packages(designate_base_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
RUN cp /etc/designate/policy.json /tmp/ \
&& rpm -e openstack-designate-api \
&& mv /tmp/policy.json /etc/designate/ \
@@ -29,7 +29,7 @@ RUN cp /etc/designate/policy.json /tmp/ \
'python-tooz'
] %}
-RUN {{ macros.install_packages(designate_base_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{% endif %}
{% elif install_type == 'source' %}
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 1775ea5e4..858fbe723 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu']%}
{% set designate_central_packages = ['designate-central'] %}
{% endif %}
-RUN {{ macros.install_packages(designate_central_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_central_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 548f4c544..660184b7f 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set designate_mdns_packages = ['designate-mdns'] %}
{% endif %}
-RUN {{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
{% endif %}
{% block designate_mdns_footer %}{% endblock %}
diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2
index d5ee01a5a..37776f477 100644
--- a/docker/designate/designate-pool-manager/Dockerfile.j2
+++ b/docker/designate/designate-pool-manager/Dockerfile.j2
@@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
'designate-pool-manager'
] %}
{% endif %}
-RUN {{ macros.install_packages(designate_pool_manager_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_pool_manager_packages | customizable("packages")) }}
{% endif %}
{% block designate_pool_manager_footer %}{% endblock %}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 8802d73d4..4c1821c9c 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
'designateclient'
] %}
{% endif %}
-RUN {{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
+{{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
{% endif %}
{% block designate_sink_footer %}{% endblock %}