diff options
| author | Martin André <m.andre@redhat.com> | 2017-04-10 10:48:10 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-05-10 17:10:28 +0200 |
| commit | 15543949b118ec30fcc1bbfc4c2f6d9188ef7664 (patch) | |
| tree | edd919c747d27501d0b1d33385acd9e5810033ab /docker/keystone | |
| parent | 501f6656ba04a618c1d4b79d50c50720fe632b78 (diff) | |
| download | kolla-15543949b118ec30fcc1bbfc4c2f6d9188ef7664.tar.gz kolla-15543949b118ec30fcc1bbfc4c2f6d9188ef7664.zip | |
Only copy plugin-archive into image for source builds
The plugin mechanism is meant to be for source install type only.
Change-Id: I1371a253236b09dc62ea91dce6d652e1c5603015
Closes-Bug: #1681345
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 |