From f2a2b69c6a73f3eb342c1d05ec984e11be5e0dfa Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Sat, 20 Aug 2016 11:20:03 +0800 Subject: [PATCH] Remove the RUN directive for macros.install_packages in the Dockerfile TrivialFix Change-Id: Ib2474257554e0b294bc39a658108326fcbbdbe58 --- docker/congress/congress-base/Dockerfile.j2 | 2 +- docker/elasticsearch/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 index 2a69643872..119b805f6f 100644 --- a/docker/congress/congress-base/Dockerfile.j2 +++ b/docker/congress/congress-base/Dockerfile.j2 @@ -18,7 +18,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} -RUN {{ macros.install_packages(congress_base_packages | customizable("packages")) }} +{{ macros.install_packages(congress_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 50edc4ab67..2e04349bc1 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -21,7 +21,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7.0-openjdk-amd64/ {% endif %} -RUN {{ macros.install_packages(elasticsearch_packages | customizable("packages")) }} +{{ macros.install_packages(elasticsearch_packages | customizable("packages")) }} COPY elasticsearch_sudoers /etc/sudoers.d/kolla_elasticsearch_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start \