Gentoo Archives: gentoo-commits

From: Alexys Jacob <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/docker-images:master commit in: /
Date: Fri, 15 Nov 2019 08:28:12
Message-Id: 1573806477.072a818cdfcd831d88927855cfe1979c6b628995.ultrabug@gentoo
1 commit: 072a818cdfcd831d88927855cfe1979c6b628995
2 Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 14 23:24:19 2019 +0000
4 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 15 08:27:57 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=072a818c
7
8 ensure build does not fail for systemd due to missing /etc/rc.conf
9
10 Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
11 Closes: https://github.com/gentoo/gentoo-docker-images/pull/72
12 Closes: https://github.com/gentoo/gentoo-docker-images/pull/71
13 Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
14
15 stage3.Dockerfile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/stage3.Dockerfile b/stage3.Dockerfile
19 index ad59ea7..e42d602 100644
20 --- a/stage3.Dockerfile
21 +++ b/stage3.Dockerfile
22 @@ -28,7 +28,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
23 && gpg --verify "${STAGE3}.DIGESTS.asc" \
24 && awk '/# SHA512 HASH/{getline; print}' ${STAGE3}.DIGESTS.asc | sha512sum -c \
25 && tar xpf "${STAGE3}" --xattrs --numeric-owner \
26 - && sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf \
27 + && ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
28 && echo 'UTC' > etc/timezone \
29 && rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS ${STAGE3}