diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 08:42:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 08:42:04 +0000 |
| commit | 03b64058a2dd4426b621d340c11b196924e089ed (patch) | |
| tree | b1652c158e24d2466c9639125e8d9a618e45f2a8 /docker | |
| parent | d3eba7bab3d25650d8023e0f8308a1673f01590b (diff) | |
| parent | 0efd4e25677979cf412846e5327698f31e86d9fb (diff) | |
| download | kolla-03b64058a2dd4426b621d340c11b196924e089ed.tar.gz kolla-03b64058a2dd4426b621d340c11b196924e089ed.zip | |
Merge "Update Trove dockerfiles for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/trove/trove-conductor/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/trove/trove-guestagent/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/trove/trove-taskmanager/Dockerfile.j2 | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 93bcf9ffe..bf6da5291 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-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-trove-api \ +RUN yum -y install \ + openstack-trove-api \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 63efeb212..0816c35c9 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/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-trove-conductor \ +RUN yum -y install \ + openstack-trove-conductor \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 8bfea68e7..65770560e 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/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-trove-guestagent \ +RUN yum -y install \ + openstack-trove-guestagent \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index e5bb1e4ba..025241a61 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/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-trove-taskmanager \ +RUN yum -y install \ + openstack-trove-taskmanager \ && yum clean all {% elif base_distro in ['ubuntu'] %} |