diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:39:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:39:28 +0000 |
| commit | 657820362dd0b52f8462054e043fd892d14fbe76 (patch) | |
| tree | d2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/cloudkitty/cloudkitty-base | |
| parent | 26fd382f176adbc104850f565df238253d8f9fc7 (diff) | |
| parent | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff) | |
| download | kolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip | |
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/cloudkitty/cloudkitty-base')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 483a2af42..641812846 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='cloudkitty') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set cloudkitty_base_packages = [ - 'openstack-cloudkitty-common', - ] %} - - {% elif base_package_type == 'deb' %} - - {% set cloudkitty_base_packages = [ - 'cloudkitty-common', - ] %} - - {% endif %} - -{{ macros.install_packages(cloudkitty_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% set cloudkitty_base_pip_packages = [ '/cloudkitty' ] %} @@ -39,8 +20,6 @@ RUN ln -s cloudkitty-base-source/* cloudkitty \ && cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \ && chown -R cloudkitty: /etc/cloudkitty -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_cloudkitty_extend_start \ |