diff options
| -rw-r--r-- | docker/rsyslog/rsyslog-base/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/rsyslog/rsyslog/Dockerfile.j2 (renamed from docker/rsyslog/Dockerfile.j2) | 12 |
2 files changed, 20 insertions, 7 deletions
diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2 new file mode 100644 index 000000000..36da7ad11 --- /dev/null +++ b/docker/rsyslog/rsyslog-base/Dockerfile.j2 @@ -0,0 +1,15 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% 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 %} +{% block footer %}{% endblock %} diff --git a/docker/rsyslog/Dockerfile.j2 b/docker/rsyslog/rsyslog/Dockerfile.j2 index 60d489b1e..ffc607d69 100644 --- a/docker/rsyslog/Dockerfile.j2 +++ b/docker/rsyslog/rsyslog/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}rsyslog-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block rsyslog_header %}{% endblock %} @@ -7,15 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set rsyslog_packages = [ - 'rsyslog', - 'rsyslog-gnutls', - 'rsyslog-mmjsonparse', - 'rsyslog-mmnormalize', + 'rsyslog-gnutls', + 'rsyslog-mmjsonparse', + 'rsyslog-mmnormalize' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set rsyslog_packages = [ - 'rsyslog', - 'rsyslog-gnutls', + 'rsyslog-gnutls' ] %} {% endif %} |