aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder/cinder-api
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/cinder/cinder-api
parent26fd382f176adbc104850f565df238253d8f9fc7 (diff)
parent1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff)
downloadkolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz
kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/cinder/cinder-api')
-rw-r--r--docker/cinder/cinder-api/Dockerfile.j220
1 files changed, 2 insertions, 18 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index a342d7636..aec2d674c 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -7,30 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
- {% set cinder_api_packages = [
- ] %}
- {% elif base_package_type == 'deb' %}
- {% set cinder_api_packages = [
- 'cinder-api'
- ] %}
- {% endif %}
-{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/cinder \
- && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
-
-{% elif install_type == 'source' %}
- {% set cinder_api_packages = [
- ] %}
+{% set cinder_api_packages = [
+] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/cinder \
&& cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start \
&& chown -R cinder: /var/www/cgi-bin/cinder \