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/zun | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/zun')
| -rw-r--r-- | docker/zun/zun-base/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/zun/zun-cni-daemon/Dockerfile.j2 | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index e8dd808da..41b022dab 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -35,18 +35,17 @@ ADD zun-base-archive /zun-base-source '/zun' ] %} +COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN ln -s zun-base-source/* zun \ && {{ macros.install_pip(zun_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/zun /var/www/cgi-bin/zun \ && cp -r /zun/etc/zun/* /etc/zun/ \ && cp /zun/zun/api/app.wsgi /var/www/cgi-bin/zun \ && chown -R zun: /etc/zun /var/www/cgi-bin/zun \ - && 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/zun/rootwrap.conf - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -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/zun/rootwrap.conf \ + && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ && touch /usr/local/bin/kolla_zun_extend_start \ && chmod 755 /var/www/cgi-bin/zun \ diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 index fee32b2fb..826351443 100644 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ b/docker/zun/zun-cni-daemon/Dockerfile.j2 @@ -23,17 +23,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }} -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers - -RUN chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers - {% block zun_cni_daemon_version %} ARG zun_cni_daemon_version=0.7.1 ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-amd64-v${zun_cni_daemon_version}.tgz {% endblock %} -RUN curl -o /tmp/cni-plugins.tgz ${zun_cni_daemon_url} \ +COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers + +RUN chmod 750 /etc/sudoers.d \ + && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ + && curl -o /tmp/cni-plugins.tgz ${zun_cni_daemon_url} \ && tar -C /opt -xzvf /tmp/cni-plugins.tgz ./loopback \ && rm -f /tmp/cni-plugins.tgz |