diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 08:46:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 08:46:55 +0000 |
| commit | 7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch) | |
| tree | 0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/swift | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 98e10a2e6..c3365578c 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -30,17 +30,16 @@ ADD swift-base-archive /swift-base-source '/swift' ] %} -RUN ln -s swift-base-source/* swift \ - && {{ macros.install_pip(swift_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/swift /var/cache/swift /var/lock/swift \ - && cp -r /swift/etc/* /etc/swift/ \ - && chown -R swift: /etc/swift /var/cache/swift /var/lock/swift - COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap COPY rootwrap.conf /etc/swift/rootwrap.conf COPY swift_sudoers /etc/sudoers.d/kolla_swift_sudoers -RUN chmod 755 /var/lib/kolla/venv/bin/swift-rootwrap \ +RUN ln -s swift-base-source/* swift \ + && {{ macros.install_pip(swift_base_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/swift /var/cache/swift /var/lock/swift \ + && cp -r /swift/etc/* /etc/swift/ \ + && chown -R swift: /etc/swift /var/cache/swift /var/lock/swift \ + && chmod 755 /var/lib/kolla/venv/bin/swift-rootwrap \ && chmod 644 /etc/swift/rootwrap.conf \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/swift/rootwrap.conf \ && chmod 750 /etc/sudoers.d \ |