diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-29 10:45:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-29 10:45:19 +0000 |
| commit | 10fb7082b70b69b3821f2bcbfd13276683bca582 (patch) | |
| tree | 9dc3e2cdb1b274a754890aeff38245503fb47d6d | |
| parent | 044a6afffcacae6680d964c8b28857c6945e4b95 (diff) | |
| parent | 06b473932d1fd26c213c7f71c59139873b9db50f (diff) | |
| download | kolla-10fb7082b70b69b3821f2bcbfd13276683bca582.tar.gz kolla-10fb7082b70b69b3821f2bcbfd13276683bca582.zip | |
Merge "Support adding customized plugin to keystone image"
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 761be7893..5a835a9f6 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -3,9 +3,13 @@ MAINTAINER {{ maintainer }} {% block keystone_header %}{% endblock %} +ADD plugins-archive / 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 +RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap \ + && if [ "$(ls /plugins)" ]; then \ + pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ + fi {% block keystone_footer %}{% endblock %} {% block footer %}{% endblock %} |