diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-26 21:20:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-26 21:20:38 +0000 |
| commit | d4213656578ab9de0c4f14545f3b9ce55b5ee92e (patch) | |
| tree | 93824c8df785624c3d9257b4bef5cf742d7cd23c /docker | |
| parent | adc81a81371c06131f3c6680348ae3f1311961e1 (diff) | |
| parent | 2fdd7e4dddceac3bde83e8d463854179a550ef42 (diff) | |
| download | kolla-d4213656578ab9de0c4f14545f3b9ce55b5ee92e.tar.gz kolla-d4213656578ab9de0c4f14545f3b9ce55b5ee92e.zip | |
Merge "Update designate dockerfile for formatting"
Diffstat (limited to 'docker')
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 |