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/swift/swift-base | |
| 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/swift/swift-base')
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 6ef3db124..98e10a2e6 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -9,39 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='swift') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set swift_base_packages = [ - 'nmap-ncat', - 'openstack-swift', - ] %} - {% elif base_package_type == 'deb' %} - {% set swift_base_packages = [ - 'netcat-openbsd', - 'rsync', - 'swift', - ] %} - {% endif %} - -{{ macros.install_packages(swift_base_packages | customizable("packages")) }} - {# NOTE(mgoddard): UCA packages seem to modify the group membership for #} - {# the swift user, removing it from the kolla group. #} - {% if base_package_type == 'deb' %} -RUN usermod --append --groups kolla swift - {% endif %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set swift_base_packages = [ - 'liberasurecode-devel', - 'nmap-ncat', - ] %} - {% elif base_package_type == 'deb' %} - {% set swift_base_packages = [ - 'liberasurecode-dev', - 'netcat-openbsd', - 'rsync', - ] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set swift_base_packages = [ + 'liberasurecode-devel', + 'nmap-ncat', + ] %} +{% elif base_package_type == 'deb' %} + {% set swift_base_packages = [ + 'liberasurecode-dev', + 'netcat-openbsd', + 'rsync', + ] %} +{% endif %} {{ macros.install_packages(swift_base_packages | customizable("packages")) }} @@ -56,7 +35,6 @@ RUN ln -s swift-base-source/* swift \ && mkdir -p /etc/swift /var/cache/swift /var/lock/swift \ && cp -r /swift/etc/* /etc/swift/ \ && chown -R swift: /etc/swift /var/cache/swift /var/lock/swift -{% endif %} COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap COPY rootwrap.conf /etc/swift/rootwrap.conf |
