diff --git a/README.adoc b/README.adoc index 25a0d98..1f67732 100644 --- a/README.adoc +++ b/README.adoc @@ -28,11 +28,11 @@ FROM gentoo/portage:latest as portage FROM tastytea/gentoo-base:latest as gentoo-base # Build packages in /workdir. -FROM gentoo/stage3-amd64:latest as build +FROM gentoo/stage3-amd64-nomultilib:latest 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 -RUN eselect profile set default/linux/amd64/17.1 +RUN eselect profile set default/linux/amd64/17.1/no-multilib RUN mkdir -p /etc/portage/package.accept_keywords RUN echo 'games-misc/cowsay' >> \ /etc/portage/package.accept_keywords/cowsay diff --git a/gentoo-base.Dockerfile b/gentoo-base.Dockerfile index a019e57..707aebf 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:latest as build +FROM gentoo/stage3-amd64-nomultilib:latest 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 @@ -14,7 +14,7 @@ RUN echo 'USE="minimal -berkdb -cracklib -gdbm -gpg -ncurses -nls \ -pam -pcre -pcre-jit -perl -readline -rsync-verify -xattr"' \ >> /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 +RUN eselect profile set default/linux/amd64/17.1/no-multilib RUN quickpkg --include-config=y @world sys-libs/glibc RUN emerge --root=/workdir --buildpkg=y --usepkg --quiet sys-apps/portage # Needed for locale generation. diff --git a/pkgcheck.Dockerfile b/pkgcheck.Dockerfile index 4d76e91..06622c6 100644 --- a/pkgcheck.Dockerfile +++ b/pkgcheck.Dockerfile @@ -5,12 +5,12 @@ FROM gentoo/portage:latest as portage FROM tastytea/gentoo-base:latest as gentoo-base # Build packages in /workdir. -FROM gentoo/stage3-amd64:latest as build +FROM gentoo/stage3-amd64-nomultilib:latest 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 ENV USE "-curl -webdav" -RUN eselect profile set default/linux/amd64/17.1 +RUN eselect profile set default/linux/amd64/17.1/no-multilib RUN mkdir -p /etc/portage/package.accept_keywords RUN echo -e 'dev-util/pkgcheck\n sys-apps/pkgcore' >> \ /etc/portage/package.accept_keywords/portage @@ -38,5 +38,5 @@ FROM gentoo/portage:latest LABEL maintainer="tastytea+docker@tastytea.de" LABEL description="Latest ~amd64 dev-util/pkgcheck." COPY --from=build /workdir / -RUN eselect profile set default/linux/amd64/17.1 +RUN eselect profile set default/linux/amd64/17.1/no-multilib ENV LANG "en_DK.utf8" diff --git a/repoman.Dockerfile b/repoman.Dockerfile index 3f436be..b72744d 100644 --- a/repoman.Dockerfile +++ b/repoman.Dockerfile @@ -5,12 +5,12 @@ FROM gentoo/portage:latest as portage FROM tastytea/gentoo-base:latest as gentoo-base # Build packages in /workdir. -FROM gentoo/stage3-amd64:latest as build +FROM gentoo/stage3-amd64-nomultilib:latest 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 ENV USE "-curl -idn -net -ssl -webdav" -RUN eselect profile set default/linux/amd64/17.1 +RUN eselect profile set default/linux/amd64/17.1/no-multilib RUN mkdir -p /etc/portage/package.accept_keywords RUN echo 'app-portage/repoman' \ >> /etc/portage/package.accept_keywords/portage @@ -35,8 +35,8 @@ RUN rm -r /workdir/usr/lib64/python*/{unit,}test # Final image. FROM gentoo/portage:latest -LABEL maintainer="tastytea+docker@tastytea.de" +LABEL maintainer="tastytea+docker@tastytea.de" \ LABEL description="Latest ~amd64 app-portage/repoman." COPY --from=build /workdir / -RUN eselect profile set default/linux/amd64/17.1 +RUN eselect profile set default/linux/amd64/17.1/no-multilib ENV LANG "en_DK.utf8"