diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 07:48:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 07:48:30 +0000 |
| commit | b5658d376e2e000a118bab98752999c12c469e3e (patch) | |
| tree | df9fbd2c2abb60139cbe2d02c268485c992b3909 /docker | |
| parent | c7ea6aa13e455eebc02f93b6b1351d3b293b9744 (diff) | |
| parent | 2075d27c11483b9c535188ca0679b1e96526718a (diff) | |
| download | kolla-b5658d376e2e000a118bab98752999c12c469e3e.tar.gz kolla-b5658d376e2e000a118bab98752999c12c469e3e.zip | |
Merge "Update Aodh dockerfiles for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/aodh/aodh-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/aodh/aodh-evaluator/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/aodh/aodh-expirer/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/aodh/aodh-listener/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/aodh/aodh-notifier/Dockerfile.j2 | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 7c526dbb9..cec1a3627 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/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-aodh-api \ +RUN yum -y install \ + openstack-aodh-api \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 8178c2903..31340bc1d 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/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-aodh-evaluator \ +RUN yum -y install \ + openstack-aodh-evaluator \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index f36fb2b0d..070da6f05 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/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-aodh-expirer \ +RUN yum -y install \ + openstack-aodh-expirer \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 64bc6c71b..d19744dc4 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/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-aodh-listener\ +RUN yum -y install \ + openstack-aodh-listener \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index ada653a3b..236004ffc 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/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-aodh-notifier\ +RUN yum -y install \ + openstack-aodh-notifier \ && yum clean all {% elif base_distro in ['ubuntu'] %} |