diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/zun/zun-base/Dockerfile.j2 | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/zun/zun-base/Dockerfile.j2')
| -rw-r--r-- | docker/zun/zun-base/Dockerfile.j2 | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index 67551c470..9e1c4f07c 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -10,31 +10,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='zun') }} -{% if install_type == 'binary' %} +{% if base_package_type == 'rpm' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - - {% set zun_base_packages = [ - 'numactl', - ] %} + {% set zun_base_packages = [ + 'numactl', + ] %} {{ macros.install_packages(zun_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/zun - {% elif base_package_type == 'deb' %} +{% elif base_package_type == 'deb' %} - {% set zun_base_packages = [ - 'numactl', - ] %} + {% set zun_base_packages = [ + 'numactl', + ] %} {{ macros.install_packages(zun_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/zun - {% endif %} +{% endif %} ADD zun-base-archive /zun-base-source @@ -50,8 +43,6 @@ RUN ln -s zun-base-source/* 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 -{% endif %} - COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |