From fd485310b909a0ad150bbfd223515266d4c2e805 Mon Sep 17 00:00:00 2001 From: Max Magorsch Date: Sat, 31 Aug 2019 17:34:30 +0200 Subject: Migrate gentoo portage location to default /var/db/repos/gentoo The default portage location has changed: https://wiki.gentoo.org/wiki//usr/portage and so has the location in the portage container: https://github.com/gentoo/gentoo-docker-images/commit/7c0dfcc Signed-off-by: Max Magorsch --- Dockerfile | 2 +- config/initializers/kkuleomi_config.rb.dist | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d54d9fa..638cb33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM gentoo/portage:latest as portage FROM gentoo/stage3-amd64 # Need a portage tree to build, use last nights. -COPY --from=portage /usr/portage /usr/portage +COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo # Sandbox doesn't work well in docker. ENV FEATURES="-userpriv -usersandbox -sandbox" diff --git a/config/initializers/kkuleomi_config.rb.dist b/config/initializers/kkuleomi_config.rb.dist index d288581..dc0e79d 100644 --- a/config/initializers/kkuleomi_config.rb.dist +++ b/config/initializers/kkuleomi_config.rb.dist @@ -1,8 +1,8 @@ # The location of the repository used for the indexer -KKULEOMI_PORTDIR='/usr/portage' +KKULEOMI_PORTDIR='/var/db/repos/gentoo' # The location of the repository used for gathering runtime information -KKULEOMI_RUNTIME_PORTDIR='/usr/portage' +KKULEOMI_RUNTIME_PORTDIR='/var/db/repos/gentoo' # The first actual git commit # Set this to the second commit in the repo to avoid long changelog generation times -- cgit v1.2.3-65-gdbad