From 7219b1896402999407c26e7bc0d8924f40ce5119 Mon Sep 17 00:00:00 2001 From: David Sheets Date: Fri, 10 Jun 2016 10:28:07 +0100 Subject: [PATCH] Revert "Merge pull request #184 from justincormack/repositories" (#195) This reverts commit ae1e96055ce1d8a521d2664776af3fa2b3ac82f5, reversing changes made to 99dfa4e4c17a49987dd065b1e3723c20235af336. --- alpine/Dockerfile | 2 ++ alpine/Makefile | 2 +- alpine/inittab.armhf | 5 ++--- alpine/inittab.x86_64 | 5 ++--- alpine/repositories | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 alpine/repositories diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5e10de49f..cb369a87b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,5 +1,7 @@ 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 67b9f9060..4ece35e12 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 $(ETCFILES) +initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) rm -f initrd.img $(MAKE) -C packages $(MAKE) -C kernel diff --git a/alpine/inittab.armhf b/alpine/inittab.armhf index d641de0ab..85c1256ca 100644 --- a/alpine/inittab.armhf +++ b/alpine/inittab.armhf @@ -1,8 +1,7 @@ # /etc/inittab -::sysinit:/sbin/openrc sysinit -::sysinit:/sbin/openrc boot -::wait:/sbin/openrc default +::sysinit:/sbin/rc sysinit +::wait:/sbin/rc 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 7b447a309..a9fa9dfe2 100644 --- a/alpine/inittab.x86_64 +++ b/alpine/inittab.x86_64 @@ -1,8 +1,7 @@ # /etc/inittab -::sysinit:/sbin/openrc sysinit -::sysinit:/sbin/openrc boot -::wait:/sbin/openrc default +::sysinit:/sbin/rc sysinit +::wait:/sbin/rc default # Put a getty on the serial port ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 diff --git a/alpine/repositories b/alpine/repositories new file mode 100644 index 000000000..f5a6bfbb4 --- /dev/null +++ b/alpine/repositories @@ -0,0 +1 @@ +http://dl-cdn.alpinelinux.org/alpine/v3.3/main