aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-22 08:46:55 +0000
committerGerrit Code Review <review@openstack.org>2022-04-22 08:46:55 +0000
commit7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch)
tree0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/barbican
parent8650c57c12498c483445536af5b5a85ada87791e (diff)
parente21aeb5ae955671937055baf57836120af8d4312 (diff)
downloadkolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz
kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip
Merge "flatten images a bit"
Diffstat (limited to 'docker/barbican')
-rw-r--r--docker/barbican/barbican-base/Dockerfile.j212
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 07961b9ad..f92fe9807 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -25,16 +25,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
ADD barbican-base-archive /barbican-base-source
-RUN ln -s barbican-base-source/* barbican \
- && {{ macros.install_pip(barbican_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/barbican \
- && cp -r /barbican/etc/barbican/* /etc/barbican/ \
- && chown -R barbican: /etc/barbican
COPY barbican_sudoers /etc/sudoers.d/kolla_barbican_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 750 /etc/sudoers.d \
+RUN ln -s barbican-base-source/* barbican \
+ && {{ macros.install_pip(barbican_base_pip_packages | customizable("pip_packages")) }} \
+ && mkdir -p /etc/barbican \
+ && cp -r /barbican/etc/barbican/* /etc/barbican/ \
+ && chown -R barbican: /etc/barbican \
+ && chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_barbican_sudoers \
&& touch /usr/local/bin/kolla_barbican_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_barbican_extend_start