From 7c063429f1135a3f5fb056225871c14d5ab00b3c Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Wed, 5 Jul 2017 20:47:21 +0200 Subject: [PATCH 1/3] alpine: add busybox-initscripts Add busybox-initscripts as it contains /etc/acpi needed to run /sbin/acpid. Signed-off-by: Magnus Skjegstad --- tools/alpine/packages | 1 + tools/alpine/versions | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/alpine/packages b/tools/alpine/packages index 5a6835220..a43e2f2a5 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -13,6 +13,7 @@ bsd-compat-headers btrfs-progs btrfs-progs-dev build-base +busybox-initscripts ca-certificates cdrkit cmake diff --git a/tools/alpine/versions b/tools/alpine/versions index bafed47df..544fdeae3 100644 --- a/tools/alpine/versions +++ b/tools/alpine/versions @@ -20,6 +20,7 @@ btrfs-progs-dev-4.10.2-r0 btrfs-progs-libs-4.10.2-r0 build-base-0.5-r0 busybox-1.26.2-r5 +busybox-initscripts-3.1-r1 bzip2-1.0.6-r5 ca-certificates-20161130-r2 cdrkit-1.1.11-r2 From ba8be57eef536ed60f53eda73a5777d69d8f282f Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Wed, 5 Jul 2017 16:40:25 +0200 Subject: [PATCH 2/3] pkg: add acpid Adds a new service for running `/sbin/acpid` that comes with busybox. The VM will shut down if the power button is pressed. Signed-off-by: Magnus Skjegstad --- pkg/acpid/Dockerfile | 22 ++++++++++++++++++++++ pkg/acpid/Makefile | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 pkg/acpid/Dockerfile create mode 100644 pkg/acpid/Makefile diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile new file mode 100644 index 000000000..7104c92f5 --- /dev/null +++ b/pkg/acpid/Dockerfile @@ -0,0 +1,22 @@ +FROM linuxkit/alpine:2e362f4459ba4491655061cccdd2fcc7a2de5eb3 AS mirror + +RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ +RUN apk add --no-cache --initdb -p /out \ + alpine-baselayout \ + busybox +RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache + +FROM linuxkit/alpine:2e362f4459ba4491655061cccdd2fcc7a2de5eb3 AS mirror2 +RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ +RUN apk add --no-cache --initdb -p /out \ + busybox-initscripts +RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache + +FROM scratch +COPY --from=mirror /out/ / +COPY --from=mirror2 /out/etc/acpi /etc/acpi + +CMD ["/sbin/acpid", "-f", "-d"] + +LABEL org.mobyproject.config='{"binds": ["/dev:/dev"], "pid": "host"}' + diff --git a/pkg/acpid/Makefile b/pkg/acpid/Makefile new file mode 100644 index 000000000..5abb21c70 --- /dev/null +++ b/pkg/acpid/Makefile @@ -0,0 +1,3 @@ +IMAGE=acpid + +include ../package.mk From 1e3c430a33b68cf5be8eb1d2377235c1edfaaa35 Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Wed, 5 Jul 2017 22:38:24 +0200 Subject: [PATCH 3/3] alpine: update versions Signed-off-by: Magnus Skjegstad --- tools/alpine/versions | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/alpine/versions b/tools/alpine/versions index 544fdeae3..2b245c0b0 100644 --- a/tools/alpine/versions +++ b/tools/alpine/versions @@ -99,7 +99,7 @@ libexecinfo-dev-1.1-r0 libfdisk-2.28.2-r2 libffi-3.2.1-r3 libgcc-6.3.0-r4 -libgcrypt-1.7.7-r0 +libgcrypt-1.7.8-r0 libgmpxx-6.1.2-r0 libgomp-6.3.0-r4 libgpg-error-1.27-r0 @@ -151,9 +151,9 @@ mkinitfs-3.1.0-r0 mpc1-1.0.3-r0 mpfr3-3.1.5-r0 mtools-4.0.18-r1 -musl-1.1.16-r10 -musl-dev-1.1.16-r10 -musl-utils-1.1.16-r10 +musl-1.1.16-r13 +musl-dev-1.1.16-r13 +musl-utils-1.1.16-r13 ncurses-dev-6.0-r7 ncurses-libs-6.0-r7 ncurses-terminfo-6.0-r7