diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rsyslog/rsyslog-base/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/rsyslog/rsyslog/Dockerfile.j2 | 26 |
2 files changed, 0 insertions, 42 deletions
diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2 deleted file mode 100644 index 6689e86f8..000000000 --- a/docker/rsyslog/rsyslog-base/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block rsyslog_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set rsyslog_base_packages = [ - 'rsyslog' -] %} - -{{ macros.install_packages(rsyslog_base_packages | customizable("packages")) }} - -{% block rsyslog_base_footer %}{% endblock %} diff --git a/docker/rsyslog/rsyslog/Dockerfile.j2 b/docker/rsyslog/rsyslog/Dockerfile.j2 deleted file mode 100644 index 5003c2b00..000000000 --- a/docker/rsyslog/rsyslog/Dockerfile.j2 +++ /dev/null @@ -1,26 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}rsyslog-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block rsyslog_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set rsyslog_packages = [ - 'rsyslog-elasticsearch', - 'rsyslog-gnutls', - 'rsyslog-mmjsonparse', - 'rsyslog-mmnormalize' - ] %} -{% elif base_package_type == 'deb' %} - {% set rsyslog_packages = [ - 'rsyslog-gnutls' - ] %} -{% endif %} - -{{ macros.install_packages(rsyslog_packages | customizable("packages")) }} - -{% block rsyslog_footer %}{% endblock %} -{% block footer %}{% endblock %} |
