github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity

move hostlog into 9pinit so it happens early enough to capture logs

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-03-17 12:27:20 +00:00
parent c8b351bda4
commit 407eba8daa
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile
View File

@ -42,7 +42,6 @@ COPY packages/dnsfix/etc /etc/
COPY packages/database/etc /etc/ COPY packages/database/etc /etc/
COPY packages/hupper/hupper /bin/ COPY packages/hupper/hupper /bin/
COPY packages/hupper/etc /etc/ COPY packages/hupper/etc /etc/
COPY packages/hostlog/etc /etc/
COPY packages/hvtools/hv_fcopy_daemon /sbin/ COPY packages/hvtools/hv_fcopy_daemon /sbin/
COPY packages/hvtools/hv_kvp_daemon /sbin/ COPY packages/hvtools/hv_kvp_daemon /sbin/
COPY packages/hvtools/hv_vss_daemon /sbin/ COPY packages/hvtools/hv_vss_daemon /sbin/
@ -88,7 +87,6 @@ RUN \
rc-update add dnsfix boot && \ rc-update add dnsfix boot && \
rc-update add database boot && \ rc-update add database boot && \
rc-update add hupper default && \ rc-update add hupper default && \
rc-update add hostlog default && \
rc-update add hv_fcopy_daemon default && \ rc-update add hv_fcopy_daemon default && \
rc-update add hv_kvp_daemon default && \ rc-update add hv_kvp_daemon default && \
rc-update add hv_vss_daemon default && \ rc-update add hv_vss_daemon default && \

6
alpine/packages/9pinit/etc/init.d/9pinit
View File

@ -28,5 +28,11 @@ start()
done done
if cat /proc/cmdline | grep -q 'com.docker.driverDir'
then
DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
mount --bind "${DRIVERDIR}/log" /var/log
fi
eend 0 eend 0
} }

20
alpine/packages/hostlog/etc/init.d/hostlog
View File

@ -1,20 +0,0 @@
#!/sbin/openrc-run
depends()
{
before acpid docker syslog chronyd
after 9pinit transfused
}
start()
{
cat /proc/cmdline | grep -q 'com.docker.driverDir' || exit 0
ebegin "Redirecting logs to host"
DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
mount --bind "${DRIVERDIR}/log" /var/log
eend $? "Failed to redirect logs to host"
}