fix Gentoo docker container

This commit is contained in:
tastytea 2022-06-20 17:57:49 +02:00
parent 7f5e4ec532
commit 4b6fc0f9e7
3 changed files with 5 additions and 5 deletions

View File

@ -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.

View File

@ -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

View File

@ -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