a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
22 lines
658 B
Django/Jinja
22 lines
658 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
{% set swift_proxy_server_packages = ['openstack-swift-proxy'] %}
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
{% set swift_proxy_server_packages = ['swift-proxy'] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
|
|
|
|
{% endif %}
|
|
|
|
{% block swift_proxy_server_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
USER swift
|