diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-14 09:00:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-14 09:00:51 +0000 |
| commit | f5084d9668b5b08b4ec9a5728023b6a4f8829bd5 (patch) | |
| tree | 73ca8e231e64cec2a0159cd545c84648cff1a67c /docker | |
| parent | 171c6f978efeec9fdcfcccf9dcb8cf394467fa5d (diff) | |
| parent | 24d7c2bed9fa5e69c7650c52717c1306cab5cc67 (diff) | |
| download | kolla-f5084d9668b5b08b4ec9a5728023b6a4f8829bd5.tar.gz kolla-f5084d9668b5b08b4ec9a5728023b6a4f8829bd5.zip | |
Merge "Barbican install from source incorrectly places config"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/source/barbican/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/centos/source/barbican/Dockerfile b/docker/centos/source/barbican/Dockerfile index 0905c8e17..cd4331ac2 100644 --- a/docker/centos/source/barbican/Dockerfile +++ b/docker/centos/source/barbican/Dockerfile @@ -10,7 +10,7 @@ RUN cd /barbican \ && pip install -r requirements.txt \ && pip install /barbican \ && mkdir /etc/barbican /var/log/barbican \ - && cp -r /barbican/etc/* /etc/barbican \ + && cp -r /barbican/etc/* /etc/ \ && rm -rf /root/.cache COPY ./start.sh /start.sh |