diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-18 13:02:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-18 13:02:46 +0000 |
| commit | 8d7a7a4b6ce609028cd3ce6ed0cab3a9bb61e81f (patch) | |
| tree | 528b1fbb9df8322522b5105644f54fec40db5890 /docker | |
| parent | 5a03d35a81d6db66267e9d0c0d1b8ade8bd4be13 (diff) | |
| parent | d0bf1404dc37e84f96f0b8779031f2e96f7824f6 (diff) | |
| download | kolla-8d7a7a4b6ce609028cd3ce6ed0cab3a9bb61e81f.tar.gz kolla-8d7a7a4b6ce609028cd3ce6ed0cab3a9bb61e81f.zip | |
Merge "Fix barbican dockerfile"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/barbican/barbican-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 6892d5303..7b6286235 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -28,9 +28,9 @@ MAINTAINER {{ maintainer }} ADD barbican-base-archive /barbican-base-source RUN ln -s barbican-base-source/* barbican \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pastedeploy uwsgi MySQL-python python-barbicanclient /barbican \ - && mkdir -p /etc/barbican /var/log/barbican \ + && mkdir -p /etc/barbican \ && cp -r /barbican/etc/barbican/* /etc/barbican/ \ - && chown -R barbican: /etc/barbican /var/log/barbican + && chown -R barbican: /etc/barbican {% endif %} |