rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-26 06:51:40 +00:00
Code Issues Releases Wiki Activity

Remove seperate image for syslog

Browse Source
This commit is contained in:
Josh Curl 2016-11-03 16:43:41 -07:00
parent 33b6145162
commit db6475c811
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
images/01-base/Dockerfile
View File

@ -34,6 +34,7 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
COPY inputrc /etc/inputrc COPY inputrc /etc/inputrc
COPY growpart /usr/bin/growpart COPY growpart /usr/bin/growpart
RUN sed -i s/"partx --update \"\$part\" \"\$dev\""/"partx --update --nr \"\$part\" \"\$dev\""/g /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"] ENTRYPOINT ["/usr/bin/ros", "entrypoint"]

4
images/02-syslog/Dockerfile
View File

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

5
images/02-syslog/syslog.sh
View File

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

3
os-config.tpl.yml
View File

@ -229,7 +229,8 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
syslog: syslog:
image: {{.OS_REPO}}/os-syslog:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: rsyslogd -n
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
log_driver: json-file log_driver: json-file