aboutsummaryrefslogtreecommitdiff
path: root/docker/freezer
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-11 09:39:28 +0000
committerGerrit Code Review <review@openstack.org>2022-04-11 09:39:28 +0000
commit657820362dd0b52f8462054e043fd892d14fbe76 (patch)
treed2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/freezer
parent26fd382f176adbc104850f565df238253d8f9fc7 (diff)
parent1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff)
downloadkolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz
kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/freezer')
-rw-r--r--docker/freezer/freezer-api/Dockerfile.j213
-rw-r--r--docker/freezer/freezer-base/Dockerfile.j218
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