diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-19 13:28:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-19 13:28:55 +0000 |
| commit | 24c55ff7897eec9505e48a30d73783ae76e45e29 (patch) | |
| tree | edf57e3540e73556d361d538a543b1a0d3a9d36a /docker/ceilometer | |
| parent | cafe368a727d979af6e5fb88fc6c673e3dab0b72 (diff) | |
| parent | a9d08726f5a48eef77c04ea1acefc00d93ce7076 (diff) | |
| download | kolla-24c55ff7897eec9505e48a30d73783ae76e45e29.tar.gz kolla-24c55ff7897eec9505e48a30d73783ae76e45e29.zip | |
Merge "Handle empty package list for install_packages"
Diffstat (limited to 'docker/ceilometer')
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index e80f3f7cf..6e65a658e 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% set ceilometer_api_packages = ['ceilometer-api'] %} {% endif %} -RUN {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} +{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} {% endif %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 3e105906d..8c7f8d15a 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -17,7 +17,7 @@ MAINTAINER {{ maintainer }} ] %} {% endif %} -RUN {{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }} +{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 26d443697..46bcc5540 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% set ceilometer_central_packages = ['ceilometer-agent-central'] %} {% endif %} -RUN {{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }} +{{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }} {% endif %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index e5f53f55e..164ed1e76 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% set ceilometer_collector_packages = ['ceilometer-collector'] %} {% endif %} -RUN {{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }} +{{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }} {% endif %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 0bdd06145..d1b63ac21 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }} ] %} {% endif %} -RUN {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} +{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index dabeeafa8..edf6ac2dd 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %} {% endif %} -RUN {{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }} +{{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }} {% endif %} |