aboutsummaryrefslogtreecommitdiff
path: root/docker/centos
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2015-08-13 15:52:28 -0400
committerRyan Hallisey <rhallise@redhat.com>2015-08-13 15:52:28 -0400
commit24d7c2bed9fa5e69c7650c52717c1306cab5cc67 (patch)
tree196a4173d5f55dce21f1c1c940363d0a11525e45 /docker/centos
parentfa9492e6c65648706998580f10a71976eab4af30 (diff)
downloadkolla-24d7c2bed9fa5e69c7650c52717c1306cab5cc67.tar.gz
kolla-24d7c2bed9fa5e69c7650c52717c1306cab5cc67.zip
Barbican install from source incorrectly places config
The barbican base Dockerfile is placing barbican.conf in /etc/barbican/barbican/barbican.conf. It should be in /etc/barbican/barbican.conf. Change-Id: I4efc040aa0b17da6cfd3bc43a1079ff45ddc3e49 Co-Authored-By: Ian Main <imain@redhat.com> Closes-Bug: #1484668
Diffstat (limited to 'docker/centos')
-rw-r--r--docker/centos/source/barbican/Dockerfile2
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