aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-02 10:10:37 +0000
committerGerrit Code Review <review@openstack.org>2017-06-02 10:10:37 +0000
commit399b2f1d5f3a9f4a69e25ee909c9de804e41efe7 (patch)
treeaff81cc225a9c88de70b015dc12c1d46955004d6 /docker/neutron
parente67409a17c21884f5898c6d8f5e485b81bf71df3 (diff)
parent15543949b118ec30fcc1bbfc4c2f6d9188ef7664 (diff)
downloadkolla-399b2f1d5f3a9f4a69e25ee909c9de804e41efe7.tar.gz
kolla-399b2f1d5f3a9f4a69e25ee909c9de804e41efe7.zip
Merge "Only copy plugin-archive into image for source builds"
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-server/Dockerfile.j219
1 files changed, 9 insertions, 10 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index cce0d40da..5273d02be 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 %}