diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-17 10:04:59 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-26 04:09:22 +0000 |
| commit | 435b21b90d97481dacbd387a3c20993ff4e4ab39 (patch) | |
| tree | 21777293b8baa88e9b0701c5931f66b670fd0d6a /docker/cinder | |
| parent | f93739fa4fbd437236775591bbaa38d8c13d33f6 (diff) | |
| download | kolla-435b21b90d97481dacbd387a3c20993ff4e4ab39.tar.gz kolla-435b21b90d97481dacbd387a3c20993ff4e4ab39.zip | |
Update ubuntu dockerfiles for formatting
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug: #1569417
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/cinder/cinder-rpcbind/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-scheduler/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index c299c81f1..2b2414b8d 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -10,7 +10,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ cinder-api \ && apt-get clean diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 74a5ebea1..13d707d87 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ cinder-backup \ && apt-get clean diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 50d243dac..7253b46bf 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -14,7 +14,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ cinder-common \ ceph-common \ lvm2 \ @@ -33,7 +33,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ lvm2 \ qemu-utils \ ceph-common \ diff --git a/docker/cinder/cinder-rpcbind/Dockerfile.j2 b/docker/cinder/cinder-rpcbind/Dockerfile.j2 index 6d3716075..02085901a 100644 --- a/docker/cinder/cinder-rpcbind/Dockerfile.j2 +++ b/docker/cinder/cinder-rpcbind/Dockerfile.j2 @@ -10,7 +10,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ rpcbind \ && apt-get clean diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 2e2a12675..3c8c0c6c6 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ cinder-scheduler \ && apt-get clean diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 35e5820e9..73ede467f 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -11,7 +11,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ tgt \ && apt-get clean |