aboutsummaryrefslogtreecommitdiff
path: root/docker/blazar
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/blazar
parent26fd382f176adbc104850f565df238253d8f9fc7 (diff)
parent1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff)
downloadkolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz
kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/blazar')
-rw-r--r--docker/blazar/blazar-api/Dockerfile.j27
-rw-r--r--docker/blazar/blazar-base/Dockerfile.j29
-rw-r--r--docker/blazar/blazar-manager/Dockerfile.j27
3 files changed, 0 insertions, 23 deletions
diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2
index 35b191f45..ee10e13fb 100644
--- a/docker/blazar/blazar-api/Dockerfile.j2
+++ b/docker/blazar/blazar-api/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block blazar_api_header %}{% endblock %}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_blazar_extend_start
RUN chmod 755 /usr/local/bin/kolla_blazar_extend_start
diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/docker/blazar/blazar-base/Dockerfile.j2
index d2bddd4dc..5cca6e4d1 100644
--- a/docker/blazar/blazar-base/Dockerfile.j2
+++ b/docker/blazar/blazar-base/Dockerfile.j2
@@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='blazar') }}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% elif install_type == 'source' %}
-
ADD blazar-base-archive /blazar-base-source
{% set blazar_base_pip_packages = [
@@ -28,8 +21,6 @@ RUN ln -s blazar-base-source/* blazar \
&& cp -r /blazar/etc/blazar/* /etc/blazar \
&& chown -R blazar: /etc/blazar
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_blazar_extend_start \
diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/docker/blazar/blazar-manager/Dockerfile.j2
index e3f0e55f4..ea7b728be 100644
--- a/docker/blazar/blazar-manager/Dockerfile.j2
+++ b/docker/blazar/blazar-manager/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block blazar_manager_header %}{% endblock %}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% endif %}
-
{% block blazar_manager_footer %}{% endblock %}
{% block footer %}{% endblock %}