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/manila | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/manila')
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index b5d70f9bb..5ceb9e372 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -11,11 +11,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {{ macros.install_packages(manila_api_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/manila \ - && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi - COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start -RUN chmod 755 /usr/local/bin/kolla_manila_extend_start \ + +RUN mkdir -p /var/www/cgi-bin/manila \ + && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \ + && chmod 755 /usr/local/bin/kolla_manila_extend_start \ && chown -R manila: /var/www/cgi-bin/manila \ && chmod 755 /var/www/cgi-bin/manila/manila-wsgi diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index ebaf09fce..d484f8f0d 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -28,17 +28,16 @@ ADD manila-base-archive /manila-base-source '/manila' ] %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers + RUN ln -s manila-base-source/* manila \ && {{ macros.install_pip(manila_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/manila /var/cache/manila \ && cp -r /manila/etc/manila/* /etc/manila/ \ && chown -R manila: /etc/manila /var/cache/manila \ - && 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/manila/rootwrap.conf - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers - -RUN chmod 750 /etc/sudoers.d \ + && 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/manila/rootwrap.conf \ + && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_manila_sudoers \ && touch /usr/local/bin/kolla_manila_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start |