diff options
| author | Martin André <m.andre@redhat.com> | 2017-04-10 10:48:10 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-05-10 17:10:28 +0200 |
| commit | 15543949b118ec30fcc1bbfc4c2f6d9188ef7664 (patch) | |
| tree | edd919c747d27501d0b1d33385acd9e5810033ab /docker/neutron | |
| parent | 501f6656ba04a618c1d4b79d50c50720fe632b78 (diff) | |
| download | kolla-15543949b118ec30fcc1bbfc4c2f6d9188ef7664.tar.gz kolla-15543949b118ec30fcc1bbfc4c2f6d9188ef7664.zip | |
Only copy plugin-archive into image for source builds
The plugin mechanism is meant to be for source install type only.
Change-Id: I1371a253236b09dc62ea91dce6d652e1c5603015
Closes-Bug: #1681345
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index a7e34c7dc..5113b8167 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -33,22 +33,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'oslo-vmware' ] %} -RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} - -{% endif %} + {% set neutron_server_plugins_pip_packages = [ + '/plugins/*' + ] %} ADD plugins-archive / - -{% set neutron_server_plugins_pip_packages = [ - '/plugins/*' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start -RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \ +RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} \ && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(neutron_server_plugins_pip_packages | customizable("pip_packages")) }}; \ fi +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start +RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start + {% block neutron_server_footer %}{% endblock %} {% block footer %}{% endblock %} |
