diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-02 10:10:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-02 10:10:37 +0000 |
| commit | 399b2f1d5f3a9f4a69e25ee909c9de804e41efe7 (patch) | |
| tree | aff81cc225a9c88de70b015dc12c1d46955004d6 /docker/keystone | |
| parent | e67409a17c21884f5898c6d8f5e485b81bf71df3 (diff) | |
| parent | 15543949b118ec30fcc1bbfc4c2f6d9188ef7664 (diff) | |
| download | kolla-399b2f1d5f3a9f4a69e25ee909c9de804e41efe7.tar.gz kolla-399b2f1d5f3a9f4a69e25ee909c9de804e41efe7.zip | |
Merge "Only copy plugin-archive into image for source builds"
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 26745fee6..d7932e793 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -5,7 +5,10 @@ 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 |