From 6cd7161a7f785abd817e1743f60341acebbdb697 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Fri, 3 Nov 2017 10:57:42 +0200
Subject: Separate rsyslog image definition

This separates the rsyslog image definition into a server image
"rsyslog" and an "rsyslog-base" image. This will enable the creation of
more finegrained images depending on the use-case, e.g.: A minimal
side-car container image that merely outputs what it gets from syslog to
stdout.

Change-Id: I33ae15c0beb5af6179a84f3722150a287316ad25
---
 docker/rsyslog/Dockerfile.j2              | 25 -------------------------
 docker/rsyslog/rsyslog-base/Dockerfile.j2 | 15 +++++++++++++++
 docker/rsyslog/rsyslog/Dockerfile.j2      | 23 +++++++++++++++++++++++
 3 files changed, 38 insertions(+), 25 deletions(-)
 delete mode 100644 docker/rsyslog/Dockerfile.j2
 create mode 100644 docker/rsyslog/rsyslog-base/Dockerfile.j2
 create mode 100644 docker/rsyslog/rsyslog/Dockerfile.j2

(limited to 'docker')

diff --git a/docker/rsyslog/Dockerfile.j2 b/docker/rsyslog/Dockerfile.j2
deleted file mode 100644
index 60d489b1e..000000000
--- a/docker/rsyslog/Dockerfile.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block rsyslog_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-    {% set rsyslog_packages = [
-            'rsyslog',
-            'rsyslog-gnutls',
-            'rsyslog-mmjsonparse',
-            'rsyslog-mmnormalize',
-    ] %}
-{% elif base_distro in ['debian', 'ubuntu'] %}
-    {% set rsyslog_packages = [
-            'rsyslog',
-            'rsyslog-gnutls',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(rsyslog_packages | customizable("packages")) }}
-
-{% block rsyslog_footer %}{% endblock %}
-{% block footer %}{% endblock %}
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/rsyslog/Dockerfile.j2 b/docker/rsyslog/rsyslog/Dockerfile.j2
new file mode 100644
index 000000000..ffc607d69
--- /dev/null
+++ b/docker/rsyslog/rsyslog/Dockerfile.j2
@@ -0,0 +1,23 @@
+FROM {{ namespace }}/{{ image_prefix }}rsyslog-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block rsyslog_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% set rsyslog_packages = [
+        'rsyslog-gnutls',
+        'rsyslog-mmjsonparse',
+        'rsyslog-mmnormalize'
+    ] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
+    {% set rsyslog_packages = [
+        'rsyslog-gnutls'
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(rsyslog_packages | customizable("packages")) }}
+
+{% block rsyslog_footer %}{% endblock %}
+{% block footer %}{% endblock %}
-- 
cgit v1.2.3