diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 07:18:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 07:18:15 +0000 |
| commit | ace413f11df6169b04c7aefc3b1fc1e193c52182 (patch) | |
| tree | f1cdb1a0c38e5b077d597d25446377b592095eb9 /docker | |
| parent | 14121d5f47923f82b8c5ca8ec9cb04f9a0301312 (diff) | |
| parent | 349d32fcecacd7c2e0f58984a3d8c1e442d0faa8 (diff) | |
| download | kolla-ace413f11df6169b04c7aefc3b1fc1e193c52182.tar.gz kolla-ace413f11df6169b04c7aefc3b1fc1e193c52182.zip | |
Merge "Update Mesos dockerfiles for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mesos/mesos-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/mesos/mesos-slave/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/mesos/mesos-base/Dockerfile.j2 b/docker/mesos/mesos-base/Dockerfile.j2 index f4dd4e450..8b97a8c74 100644 --- a/docker/mesos/mesos-base/Dockerfile.j2 +++ b/docker/mesos/mesos-base/Dockerfile.j2 @@ -3,7 +3,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum install -y \ +RUN yum -y install \ mesos \ && yum clean all diff --git a/docker/mesos/mesos-slave/Dockerfile.j2 b/docker/mesos/mesos-slave/Dockerfile.j2 index 339468d20..791b61555 100644 --- a/docker/mesos/mesos-slave/Dockerfile.j2 +++ b/docker/mesos/mesos-slave/Dockerfile.j2 @@ -7,7 +7,7 @@ COPY docker.repo /etc/yum.repos.d/docker.repo RUN rpm --import https://yum.dockerproject.org/gpg -RUN yum install -y \ +RUN yum -y install \ docker-engine \ && yum clean all |