openstack
/
kolla
Code Issues Proposed changes

Skip plugins install for keystone binary builds 

There should be no pip install in binary builds, move the installation
of the downloaded bits where it belongs into the 'source' install_type
section.

Change-Id: I6d8609d072d18e635250df1c1e9aa687ce1f769d
This commit is contained in:
Martin André 2017-12-19 13:56:22 +01:00
parent f3ff6fb2f2
commit 93ed43818b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/keystone/keystone/Dockerfile.j2
View File

@ -5,21 +5,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'source' %}
ADD plugins-archive /
{% endif %}
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
{% if install_type == 'source' %}
ADD plugins-archive /
{% set keystone_plugins_pip_packages = [
'/plugins/*'
] %}
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap \
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
fi
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
fi
{% endif %}
{% block keystone_footer %}{% endblock %}
{% block footer %}{% endblock %}