aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-21 17:10:12 +0530
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-21 17:44:55 +0000
commit2fdd7e4dddceac3bde83e8d463854179a550ef42 (patch)
treeb801a0e53035589bfe9b85fcf9c81130e479a32d
parenta861450fd29d7a2ea56eb755473da171443b38f6 (diff)
downloadkolla-2fdd7e4dddceac3bde83e8d463854179a550ef42.tar.gz
kolla-2fdd7e4dddceac3bde83e8d463854179a550ef42.zip
Update designate dockerfile for formatting
Change-Id: I6d87fd19db433023d3d466e21e6dff27d7bf3927 Partial-Bug:#1569417
-rw-r--r--docker/designate/designate-api/Dockerfile.j22
-rw-r--r--docker/designate/designate-backend-bind9/Dockerfile.j23
-rw-r--r--docker/designate/designate-base/Dockerfile.j22
-rw-r--r--docker/designate/designate-central/Dockerfile.j23
-rw-r--r--docker/designate/designate-mdns/Dockerfile.j23
-rw-r--r--docker/designate/designate-poolmanager/Dockerfile.j26
-rw-r--r--docker/designate/designate-sink/Dockerfile.j22
7 files changed, 12 insertions, 9 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 0f20163ca..df26862cf 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y \
+RUN yum -y install \
openstack-designate-api \
&& yum clean all
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 6ed56cb7a..5508fb16f 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y bind \
+RUN yum -y install \
+ bind \
&& yum clean all \
&& mkdir -p /var/lib/kolla/ \
&& cp -pr /var/named /var/lib/kolla/var-named
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 4aec9796c..160642cd1 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
# is needed in all services. This is probably a packaging bug. We do
# need the complete policy file because of some of the containers'
# requiring it. Remove the package when the file is moved though.
-RUN yum install -y \
+RUN yum -y install \
openstack-designate-api \
openstack-designate-common \
python-tooz \
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index dfd67978e..9828da3fa 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y openstack-designate-central \
+RUN yum -y install \
+ openstack-designate-central \
&& yum clean all
{% elif base_distro in ['ubuntu']%}
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 2ed4386af..f8e1270d4 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y openstack-designate-mdns \
+RUN yum -y install \
+ openstack-designate-mdns \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
index 9cad51c89..8e3d68212 100644
--- a/docker/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
@@ -5,16 +5,16 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# The bind9 package here is only to provide the rndc binary.
-RUN yum install -y \
- openstack-designate-pool-manager \
+RUN yum -y install \
bind \
+ openstack-designate-pool-manager \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
- designate-pool-manager \
bind9 \
+ designate-pool-manager \
&& apt-get clean
{% endif %}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 0c882ceb9..daa271266 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y \
+RUN yum -y install \
openstack-designate-sink \
python-designateclient \
&& yum clean all