aboutsummaryrefslogtreecommitdiff
path: root/docker/vitrage/vitrage-base
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/vitrage/vitrage-base
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/vitrage/vitrage-base')
-rw-r--r--docker/vitrage/vitrage-base/Dockerfile.j247
1 files changed, 5 insertions, 42 deletions
diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2
index 89b3d04d0..79fa8f770 100644
--- a/docker/vitrage/vitrage-base/Dockerfile.j2
+++ b/docker/vitrage/vitrage-base/Dockerfile.j2
@@ -10,53 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['powertools']) }}
{{ macros.configure_user(name='vitrage') }}
-{% if install_type == 'binary' %}
-
- {% if base_package_type == 'rpm' %}
-
- {% set vitrage_base_packages = [
- 'openstack-vitrage-common'
- ] %}
-
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} \
- && mkdir -p /var/www/cgi-bin/vitrage \
- && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \
- && chown -R vitrage: /var/www/cgi-bin/vitrage
-
- {% elif base_package_type == 'deb' %}
- {% if base_distro == 'debian' %}
+{% if base_package_type == 'rpm' %}
{% set vitrage_base_packages = [
- 'python3-vitrage',
- 'vitrage-common'
] %}
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
-
- {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
- {% endif %}
- {% endif %}
-
-{% elif install_type == 'source' %}
-
- {% if base_package_type == 'rpm' %}
+{% elif base_package_type == 'deb' %}
- {% set vitrage_base_packages = [
- ] %}
-
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
-
- {% elif base_package_type == 'deb' %}
-
- {% set vitrage_base_packages = [
- ] %}
+ {% set vitrage_base_packages = [
+ ] %}
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
{% endif %}
+{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
{% set vitrage_base_pip_packages = [
'/vitrage'
@@ -70,8 +35,6 @@ RUN ln -s vitrage-base-source/* vitrage \
&& cp /vitrage/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage \
&& chown -R vitrage: /etc/vitrage /var/www/cgi-bin/vitrage
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_vitrage_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start