Remove seperate image for syslog

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"]

images/02-syslog/Dockerfile

@@ -1,4 +0,0 @@
-FROM rancher/os-base
-COPY syslog.sh /
-RUN sed -i 1,10d /etc/rsyslog.conf
-CMD ["/syslog.sh"] 

images/02-syslog/syslog.sh

@@ -1,5 +0,0 @@
-#!bin/bash
-
-set -x -e
-
-exec rsyslogd -n

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