From 4b6fc0f9e770ed91b4a95039e6145593e76e7f74 Mon Sep 17 00:00:00 2001 From: tastytea Date: Mon, 20 Jun 2022 17:57:49 +0200 Subject: [PATCH] fix Gentoo docker container --- gentoo-base.Dockerfile | 6 +++--- pkgcheck.Dockerfile | 2 +- repoman.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gentoo-base.Dockerfile b/gentoo-base.Dockerfile index 2beb1f9..ec4ae79 100644 --- a/gentoo-base.Dockerfile +++ b/gentoo-base.Dockerfile @@ -2,7 +2,7 @@ FROM gentoo/portage:latest as portage # Build packages in /workdir. -FROM gentoo/stage3:amd64-nomultilib as build +FROM gentoo/stage3:amd64-nomultilib-openrc as build COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo RUN sed -i 's/-O2/-Os/' /etc/portage/make.conf RUN echo -e '\n# Added by tastytea/gentoo-base:' >> /etc/portage/make.conf @@ -11,7 +11,7 @@ RUN echo 'FEATURES="-ipc-sandbox -mount-sandbox -network-sandbox -pid-sandbox \ -sandbox -usersandbox nodoc noinfo noman"' >> /etc/portage/make.conf RUN echo 'MAKEOPTS="-j1"' >> /etc/portage/make.conf RUN echo 'USE="minimal -berkdb -cracklib -gdbm -gpg -ncurses -nls \ - -pam -pcre -pcre-jit -perl -readline -rsync-verify -xattr"' \ + -pam -pcre -pcre-jit -perl -readline -rsync-verify -xattr -su"' \ >> /etc/portage/make.conf RUN echo -e 'L10N="en_DK"\nLINGUAS="en_DK"' >> /etc/portage/make.conf RUN eselect profile set default/linux/amd64/17.1/no-multilib @@ -20,7 +20,7 @@ RUN emerge --root=/workdir --buildpkg=y --usepkg --quiet sys-apps/portage # Needed for locale generation. RUN emerge --root=/workdir --buildpkg=y --usepkg --quiet \ sys-apps/grep sys-apps/gawk app-arch/gzip sys-devel/gcc -RUN cp /etc/portage/make.conf /workdir/etc/portage/make.conf +RUN mkdir -p /workdir/etc/portage && cp /etc/portage/make.conf /workdir/etc/portage/make.conf RUN rm -r /workdir/usr/lib/python*/{unit,}test # Final image. diff --git a/pkgcheck.Dockerfile b/pkgcheck.Dockerfile index 3e4dc44..1a66aae 100644 --- a/pkgcheck.Dockerfile +++ b/pkgcheck.Dockerfile @@ -5,7 +5,7 @@ FROM gentoo/portage:latest as portage FROM tastytea/gentoo-base:latest as gentoo-base # Build packages in /workdir. -FROM gentoo/stage3:amd64-nomultilib as build +FROM gentoo/stage3:amd64-nomultilib-openrc as build COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo COPY --from=gentoo-base / /workdir RUN cp /workdir/etc/portage/make.conf /etc/portage/make.conf diff --git a/repoman.Dockerfile b/repoman.Dockerfile index 5857896..c762222 100644 --- a/repoman.Dockerfile +++ b/repoman.Dockerfile @@ -5,7 +5,7 @@ FROM gentoo/portage:latest as portage FROM tastytea/gentoo-base:latest as gentoo-base # Build packages in /workdir. -FROM gentoo/stage3:amd64-nomultilib as build +FROM gentoo/stage3:amd64-nomultilib-openrc as build COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo COPY --from=gentoo-base / /workdir RUN cp /workdir/etc/portage/make.conf /etc/portage/make.conf