From db6475c811c9bc2d8a9f330644c699eef6e4258d Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Thu, 3 Nov 2016 16:43:41 -0700
Subject: [PATCH] Remove seperate image for syslog

---
 images/01-base/Dockerfile   | 3 ++-
 images/02-syslog/Dockerfile | 4 ----
 images/02-syslog/syslog.sh  | 5 -----
 os-config.tpl.yml           | 3 ++-
 4 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 images/02-syslog/Dockerfile
 delete mode 100755 images/02-syslog/syslog.sh

diff --git a/images/01-base/Dockerfile b/images/01-base/Dockerfile
index 6929c088..dbcfcbf3 100644
--- a/images/01-base/Dockerfile
+++ b/images/01-base/Dockerfile
@@ -34,6 +34,7 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
 COPY inputrc /etc/inputrc
 COPY growpart /usr/bin/growpart
 RUN sed -i s/"partx --update \"\$part\" \"\$dev\""/"partx --update --nr \"\$part\" \"\$dev\""/g /usr/bin/growpart && \
-    sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf
+    sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf && \
+    sed -i 1,10d /etc/rsyslog.conf
 
 ENTRYPOINT ["/usr/bin/ros", "entrypoint"]
diff --git a/images/02-syslog/Dockerfile b/images/02-syslog/Dockerfile
deleted file mode 100644
index b97ad7bf..00000000
--- a/images/02-syslog/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM rancher/os-base
-COPY syslog.sh /
-RUN sed -i 1,10d /etc/rsyslog.conf
-CMD ["/syslog.sh"] 
diff --git a/images/02-syslog/syslog.sh b/images/02-syslog/syslog.sh
deleted file mode 100755
index 285ffefa..00000000
--- a/images/02-syslog/syslog.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!bin/bash
-
-set -x -e
-
-exec rsyslogd -n
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 0d2d652f..eb30e607 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -229,7 +229,8 @@ rancher:
       - command-volumes
       - system-volumes
     syslog:
-      image: {{.OS_REPO}}/os-syslog:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: rsyslogd -n
       labels:
         io.rancher.os.scope: system
       log_driver: json-file