diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-26 11:13:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-26 11:13:10 +0000 |
| commit | 383730443c6b41c8b4bf163230ee37b0f6296aca (patch) | |
| tree | e5000594e53edcf04a3b6b07683bc05e2f94ca76 /docker/ceilometer | |
| parent | 6148a303eece8036349cd61492f0c9aed1d86616 (diff) | |
| parent | 435b21b90d97481dacbd387a3c20993ff4e4ab39 (diff) | |
| download | kolla-383730443c6b41c8b4bf163230ee37b0f6296aca.tar.gz kolla-383730443c6b41c8b4bf163230ee37b0f6296aca.zip | |
Merge "Update ubuntu dockerfiles for formatting"
Diffstat (limited to 'docker/ceilometer')
6 files changed, 7 insertions, 7 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index f3695a2b8..9d363498f 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-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 \ ceilometer-api \ && apt-get clean diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 90ce0b334..b637e4125 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -12,7 +12,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 \ ceilometer-common \ && apt-get clean diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 44dae4004..e2c37afa7 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/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 \ ceilometer-agent-central \ && apt-get clean diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index 5bf0e9a2d..d67b2b180 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/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 \ ceilometer-collector \ && apt-get clean diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index d8cd44e83..829d1403e 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -11,7 +11,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 \ ceilometer-agent-compute \ python-ceilometerclient \ && apt-get clean @@ -26,7 +26,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 \ libvirt-dev \ && apt-get clean diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 7546f0f5a..8896dc562 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/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 \ ceilometer-agent-notification \ && apt-get clean |