aboutsummaryrefslogtreecommitdiff
path: root/docker/solum
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-01 13:41:14 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-09 17:44:26 +0200
commit1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch)
tree05427aa46ce6473684cfe2a824798306291546c9 /docker/solum
parentcabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff)
downloadkolla-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/solum')
-rw-r--r--docker/solum/solum-api/Dockerfile.j27
-rw-r--r--docker/solum/solum-base/Dockerfile.j29
-rw-r--r--docker/solum/solum-conductor/Dockerfile.j27
-rw-r--r--docker/solum/solum-deployer/Dockerfile.j27
-rw-r--r--docker/solum/solum-worker/Dockerfile.j27
5 files changed, 0 insertions, 37 deletions
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2
index c47460543..06fbb038c 100644
--- a/docker/solum/solum-api/Dockerfile.j2
+++ b/docker/solum/solum-api/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block solum_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_solum_extend_start
RUN chmod 755 /usr/local/bin/kolla_solum_extend_start
diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2
index 9a7d252ad..050d73d58 100644
--- a/docker/solum/solum-base/Dockerfile.j2
+++ b/docker/solum/solum-base/Dockerfile.j2
@@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='solum') }}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% elif install_type == 'source' %}
-
ADD solum-base-archive /solum-base-source
{% set solum_base_pip_packages = [
@@ -28,8 +21,6 @@ RUN ln -s solum-base-source/* solum \
&& cp -r /solum/etc/solum/* /etc/solum/ \
&& chown -R solum: /etc/solum
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_solum_extend_start \
diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2
index 28298a7d1..b5adbbd08 100644
--- a/docker/solum/solum-conductor/Dockerfile.j2
+++ b/docker/solum/solum-conductor/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block solum_conductor_header %}{% endblock %}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% endif %}
-
{% block solum_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2
index d8998572e..50ad84752 100644
--- a/docker/solum/solum-deployer/Dockerfile.j2
+++ b/docker/solum/solum-deployer/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block solum_deployer_header %}{% endblock %}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% endif %}
-
{% block solum_deployer_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2
index 69d02de28..049a33dd6 100644
--- a/docker/solum/solum-worker/Dockerfile.j2
+++ b/docker/solum/solum-worker/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block solum_worker_header %}{% endblock %}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% endif %}
-
{% block solum_worker_footer %}{% endblock %}
{% block footer %}{% endblock %}