From 0ffc54bfaa4d8dd613703f1d6ae1f9948fdbeeb4 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 10 Jun 2016 10:52:13 +0100 Subject: [PATCH 1/3] Revert "Revert "Merge pull request #184 from justincormack/repositories" (#195)" This reverts commit 34d44e20d4a49b7354ce267d6d69317069ae00d4. --- alpine/Dockerfile | 2 -- alpine/Makefile | 2 +- alpine/inittab.armhf | 5 +++-- alpine/inittab.x86_64 | 5 +++-- alpine/repositories | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 alpine/repositories diff --git a/alpine/Dockerfile b/alpine/Dockerfile index cb369a87b..5e10de49f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.4 -COPY repositories /etc/apk/ - RUN \ addgroup -g 50 docker && \ adduser -G docker -u 1001 -s /bin/sh -D -g "Docker" docker && \ diff --git a/alpine/Makefile b/alpine/Makefile index 4ece35e12..67b9f9060 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -3,7 +3,7 @@ all: initrd.img.gz mobylinux-efi.iso ETCFILES=etc/issue etc/motd etc/network/interfaces ETCFILES+=etc/securetty -initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) +initrd.img: Dockerfile mkinitrd.sh $(ETCFILES) rm -f initrd.img $(MAKE) -C packages $(MAKE) -C kernel diff --git a/alpine/inittab.armhf b/alpine/inittab.armhf index 85c1256ca..d641de0ab 100644 --- a/alpine/inittab.armhf +++ b/alpine/inittab.armhf @@ -1,7 +1,8 @@ # /etc/inittab -::sysinit:/sbin/rc sysinit -::wait:/sbin/rc default +::sysinit:/sbin/openrc sysinit +::sysinit:/sbin/openrc boot +::wait:/sbin/openrc default # Put a getty on the serial port ttyAMA0::respawn:/sbin/getty -L ttyAMA0 115200 vt100 diff --git a/alpine/inittab.x86_64 b/alpine/inittab.x86_64 index a9fa9dfe2..7b447a309 100644 --- a/alpine/inittab.x86_64 +++ b/alpine/inittab.x86_64 @@ -1,7 +1,8 @@ # /etc/inittab -::sysinit:/sbin/rc sysinit -::wait:/sbin/rc default +::sysinit:/sbin/openrc sysinit +::sysinit:/sbin/openrc boot +::wait:/sbin/openrc default # Put a getty on the serial port ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 diff --git a/alpine/repositories b/alpine/repositories deleted file mode 100644 index f5a6bfbb4..000000000 --- a/alpine/repositories +++ /dev/null @@ -1 +0,0 @@ -http://dl-cdn.alpinelinux.org/alpine/v3.3/main From 57cf0606684335c1ca8fddf56a3b291ddd858523 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 10 Jun 2016 11:10:28 +0100 Subject: [PATCH 2/3] start hwclock in boot runlevel Signed-off-by: Justin Cormack --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5e10de49f..176e088ad 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -80,6 +80,7 @@ RUN \ rc-update add urandom boot && \ rc-update add hostname boot && \ rc-update add syslog boot && \ + rc-update add hwclock boot && \ rc-update add networking boot && \ rc-update add acpid default && \ rc-update add chronyd default && \ From 31c5b24513cb2be7eac55e68694ce5e9e467b5d3 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 10 Jun 2016 11:26:32 +0100 Subject: [PATCH 3/3] remove transfused dependency from hostsettings by putting log mounts in docker startup Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 8 ++++++++ alpine/packages/hostsettings/etc/init.d/hostsettings | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 8672517a7..1fdc5bd8f 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -49,6 +49,14 @@ start() [ -d /Mac/$d ] && [ ! -d $d ] && mkdir -p /$d && mount --bind /Mac/$d /$d done + # shift logs onto host before docker starts + # busybox reopens its log files every second + if cat /proc/cmdline | grep -q 'com.docker.driverDir' + then + DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" + grep -q "osxfs on /var/log" || mount --bind "${DRIVERDIR}/log" /var/log + fi + # same default ulimit as boot2docker; if you want more can set at docker run time DOCKER_ULIMITS=1048576 ulimit -n $DOCKER_ULIMITS diff --git a/alpine/packages/hostsettings/etc/init.d/hostsettings b/alpine/packages/hostsettings/etc/init.d/hostsettings index aaf5d9190..6f05e2f16 100755 --- a/alpine/packages/hostsettings/etc/init.d/hostsettings +++ b/alpine/packages/hostsettings/etc/init.d/hostsettings @@ -3,7 +3,6 @@ description="Configuring settings from database." depend() { - need transfused before sysctl net } @@ -12,14 +11,6 @@ start() { mobyconfig exists etc/sysctl.conf && mobyconfig get etc/sysctl.conf > /etc/sysctl.conf - # shift logs onto host before docker starts - # busybox reopens its log files every second - 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 - mobyconfig exists etc/resolv.conf && mobyconfig get etc/resolv.conf > /etc/resolv.conf # handle static network config if configured