mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-08 00:23:29 +00:00
de6e7f9cbe
Reconfigure chronyd in a udhcpc post-bound hook and restart it, but use conditionalrestart so it is not started if it isn't running, which is the case during boot when this hook happens from init.d/networking via ifup, running "service ... start" in that context results in the daemon running but the service db saying it isn't. Doing it in the udhcpc hook leaves a nice hole where support for getting the NTP server via DHCP can fit in once it is available. This also switches from using "initstepslew" to "makestep", the former was responsible for the long delay starting chronyd (meaning we can now drop "before chronyd" from Docker's init dependencies), while the later will force a step if the time is out by more than the configured amount (half a second here), meaning it will be corrected on resume. The rest of the time it chrony will do the usual slewing to keep the clock accurate. Passing -1 as the limit to "makestep" ensures the step will always occur, if it were positive it would only be done that number of times. We add "iburst" and "minpoll 2" to the default configuration file to speed up initial sync and resync after sleep respectively, resync after sleep happens in a couple of seconds. In "ntp=gateway" mode we also patch in "trust", this isn't in the default config file since we won't be so sure about DHCP provided servers, but when talking to a host provided NTP we want to use its time (for sync accross host mounts) even if it has a crazy idea about what the time is. With this we can also remove the 15min ntp sync, which in turn gets rid of the need for cron. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
115 lines
3.3 KiB
Docker
115 lines
3.3 KiB
Docker
FROM alpine:3.4
|
|
|
|
RUN \
|
|
addgroup -g 50 docker && \
|
|
adduser -G docker -u 1001 -s /bin/sh -D -g "Docker" docker && \
|
|
passwd -d root && \
|
|
apk update && apk upgrade && \
|
|
apk add \
|
|
e2fsprogs \
|
|
chrony \
|
|
git \
|
|
xz \
|
|
iptables \
|
|
sfdisk \
|
|
lvm2 \
|
|
syslinux \
|
|
openrc \
|
|
busybox-initscripts \
|
|
alpine-conf \
|
|
bind-tools \
|
|
openssh-client \
|
|
strace \
|
|
fuse \
|
|
util-linux \
|
|
cifs-utils \
|
|
e2fsprogs-extra \
|
|
&& rm -rf /var/cache/apk/*
|
|
|
|
COPY etc /etc/
|
|
RUN mkdir -p /etc/docker
|
|
|
|
ADD kernel/aufs-utils.tar /
|
|
COPY mkinitrd.sh /bin/
|
|
COPY kernel/kernel-source-info /etc/
|
|
ADD kernel/kernel-patches.tar /etc/kernel-patches
|
|
|
|
COPY packages/proxy/proxy /sbin/
|
|
COPY packages/proxy/proxy /sbin/proxy-vsockd
|
|
COPY packages/proxy/etc /etc/
|
|
COPY packages/transfused/transfused /sbin/
|
|
COPY packages/transfused/etc /etc/
|
|
COPY packages/tap-vsockd/tap-vsockd /sbin/
|
|
COPY packages/tap-vsockd/etc /etc/
|
|
COPY packages/llmnrd/llmnrd /sbin/
|
|
COPY packages/llmnrd/etc /etc/
|
|
COPY packages/llmnrd/llmnrd.tar.gz /usr/share/src/
|
|
COPY packages/docker/bin/* /usr/bin/
|
|
COPY packages/docker/etc /etc/
|
|
COPY packages/diagnostics/diagnostics /usr/bin/
|
|
COPY packages/diagnostics/diagnostics-server /usr/bin/
|
|
COPY packages/diagnostics/etc /etc/
|
|
COPY packages/automount/etc /etc/
|
|
COPY packages/binfmt_misc/etc /etc/
|
|
COPY packages/dnsfix/etc /etc/
|
|
COPY packages/hostsettings/etc /etc/
|
|
COPY packages/hvtools/hv_kvp_daemon /sbin/
|
|
COPY packages/hvtools/hv_vss_daemon /sbin/
|
|
COPY packages/hvtools/etc /etc/
|
|
COPY packages/hvtools/hv_get_dhcp_info /sbin/
|
|
COPY packages/hvtools/hv_get_dns_info /sbin/
|
|
COPY packages/hvtools/hv_set_ifconfig /sbin/
|
|
COPY packages/hvtools/hvtools.tar.gz /usr/share/src/
|
|
COPY packages/chronyd/etc /etc/
|
|
COPY packages/userns/etc /etc/
|
|
COPY packages/userns/groupadd /usr/sbin
|
|
COPY packages/userns/useradd /usr/sbin
|
|
#COPY packages/nc-vsock/nc-vsock /usr/bin
|
|
COPY packages/vsudd/vsudd /sbin
|
|
COPY packages/vsudd/etc /etc
|
|
COPY packages/mobyconfig/mobyconfig /usr/bin
|
|
COPY packages/bootflag/bootflag /usr/bin
|
|
COPY packages/gummiboot/gummiboot.tar.gz /usr/share/src/
|
|
COPY packages/oom/etc /etc
|
|
COPY packages/9pmount-vsock/9pmount-vsock /sbin
|
|
|
|
RUN \
|
|
rc-update add swap boot && \
|
|
rc-update add sysctl boot && \
|
|
rc-update add bootmisc boot && \
|
|
rc-update add urandom boot && \
|
|
rc-update add hostname boot && \
|
|
rc-update add syslog boot && \
|
|
rc-update add networking boot && \
|
|
rc-update add acpid default && \
|
|
rc-update add chronyd default && \
|
|
rc-update add savecache shutdown && \
|
|
rc-update add killprocs shutdown && \
|
|
rc-update add mount-ro shutdown && \
|
|
rc-update add dmesg sysinit && \
|
|
rc-update add devfs sysinit && \
|
|
rc-update add hwdrivers sysinit && \
|
|
rc-update add sysfs && \
|
|
rc-update add fsck && \
|
|
rc-update add root && \
|
|
rc-update add localmount && \
|
|
rc-update add klogd && \
|
|
rc-update add docker default && \
|
|
rc-update add proxy default && \
|
|
rc-update add transfused default && \
|
|
rc-update add llmnrd default && \
|
|
rc-update add automount boot && \
|
|
rc-update add diagnostics default && \
|
|
rc-update add binfmt_misc sysinit && \
|
|
rc-update add dnsfix boot && \
|
|
rc-update add hostsettings boot && \
|
|
rc-update add hv_kvp_daemon default && \
|
|
rc-update add hv_vss_daemon default && \
|
|
rc-update add vsudd default && \
|
|
rc-update add oom default && \
|
|
true
|
|
|
|
COPY init /
|
|
|
|
CMD ["/bin/sh"]
|