diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-03 19:36:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-03 19:36:04 +0000 |
| commit | bee9ea39ff1b1c960c5f4f8f1a26fcced71a4ec3 (patch) | |
| tree | 2905546244d14b0f5c268a17b0460f80f54d4015 | |
| parent | b041bdcdf17d8110d260dc7676fca5c7c3be9654 (diff) | |
| parent | 93ed43818b7ca334854f4b431a9ef56559d2d7f6 (diff) | |
| download | kolla-bee9ea39ff1b1c960c5f4f8f1a26fcced71a4ec3.tar.gz kolla-bee9ea39ff1b1c960c5f4f8f1a26fcced71a4ec3.zip | |
Merge "Skip plugins install for keystone binary builds"
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index d7932e793..f56013aa6 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -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 %} |