diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-08-20 11:20:03 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-08-20 13:35:09 +0800 |
| commit | f2a2b69c6a73f3eb342c1d05ec984e11be5e0dfa (patch) | |
| tree | 36226ab066cd427b6706a8ab1fd6e5a325f64b30 | |
| parent | 464715d1ad6bb0a6c21c9213c6175cdc1c1f6ac5 (diff) | |
| download | kolla-f2a2b69c6a73f3eb342c1d05ec984e11be5e0dfa.tar.gz kolla-f2a2b69c6a73f3eb342c1d05ec984e11be5e0dfa.zip | |
Remove the RUN directive for macros.install_packages in the Dockerfile
TrivialFix
Change-Id: Ib2474257554e0b294bc39a658108326fcbbdbe58
| -rw-r--r-- | docker/congress/congress-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | 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 2a6964387..119b805f6 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 50edc4ab6..2e04349bc 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 \ |