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/kuryr | |
| 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/kuryr')
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 28 |
2 files changed, 10 insertions, 26 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index bc5cb7571..64baa348b 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='kuryr') }} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - ADD kuryr-base-archive /kuryr-base-source {% set kuryr_base_pip_packages = [ @@ -29,7 +22,6 @@ RUN ln -s kuryr-base-source/* kuryr-base \ && {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/kuryr \ && chown -R kuryr: /etc/kuryr -{% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index 333d71ccd..fe69b9f25 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -9,26 +9,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} -{% if install_type == 'binary' %} +{% if base_package_type == 'rpm' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set kuryr_libnetwork_packages = [ + 'openvswitch' + ] %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} +{% elif base_package_type == 'deb' %} - {% set kuryr_libnetwork_packages = [ - 'openvswitch' - ] %} + {% set kuryr_libnetwork_packages = [ + 'bridge-utils', + 'openvswitch-switch' + ] %} - {% elif base_package_type == 'deb' %} - - {% set kuryr_libnetwork_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - - {% endif %} +{% endif %} {{ macros.install_packages(kuryr_libnetwork_packages | customizable("packages")) }} ADD kuryr-libnetwork-archive /kuryr-libnetwork-source @@ -40,7 +34,5 @@ ADD kuryr-libnetwork-archive /kuryr-libnetwork-source RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \ && {{ macros.install_pip(kuryr_libnetwork_pip_packages | customizable("pip_packages")) }} -{% endif %} - {% block kuryr_libnetwork_footer %}{% endblock %} {% block footer %}{% endblock %} |