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/freezer | |
| 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/freezer')
| -rw-r--r-- | docker/freezer/freezer-api/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 18 |
2 files changed, 7 insertions, 24 deletions
diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index 27651d6ef..3e393a0de 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -7,15 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - - {% set freezer_api_packages = [ - ] %} +{% set freezer_api_packages = [ +] %} {{ macros.install_packages(freezer_api_packages | customizable("packages")) }} @@ -29,8 +22,6 @@ RUN ln -s freezer-api-source/* freezer-api \ && {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \ && cp -r /freezer-api/etc/freezer/* /etc/freezer/ -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start RUN chmod 755 /usr/local/bin/kolla_freezer_extend_start diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 52cbecd1e..6cf186d57 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -9,18 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='freezer') }} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - {% if base_package_type == 'deb' %} - {% set freezer_base_packages = [ - 'trickle' - ] %} +{% if base_package_type == 'deb' %} + {% set freezer_base_packages = [ + 'trickle' + ] %} {{ macros.install_packages(freezer_base_packages | customizable("packages")) }} - {% endif %} +{% endif %} ADD freezer-base-archive /freezer-base-source @@ -34,8 +28,6 @@ RUN ln -s freezer-base-source/* freezer \ && {{ macros.install_pip(freezer_base_pip_packages | customizable("pip_packages")) }} \ && cp -r /freezer/etc/* /etc/freezer -{% endif %} - COPY freezer_sudoers /etc/sudoers.d/kolla_freezer_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |