diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/cinder/cinder-api | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-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/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 20 |
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 \ |