diff options
| author |   Ultrabug <ultrabug@users.noreply.github.com> | 2019-07-19 10:36:47 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-07-19 10:36:47 +0200 |
| commit | 7c0dfccbb82346d0217b4f0a25aaf083f0fb873f (patch) | |
| tree | 8aa72fd2c4a2418db1e850f703e9bc3b5cf291e0 | |
| parent | Fix docker login (diff) | |
| download | docker-images-7c0dfccbb82346d0217b4f0a25aaf083f0fb873f.tar.gz docker-images-7c0dfccbb82346d0217b4f0a25aaf083f0fb873f.tar.bz2 docker-images-7c0dfccbb82346d0217b4f0a25aaf083f0fb873f.zip | |
migrate gentoo portage location to default /var/db/repos/gentoo (fix #69) (#70)
as reported by @MeisterP on #69 our current portage volume image does
not expose the portage tree in the default gentoo portage location
which changed from /usr/portage to /var/db/repos/gentoo
those defaults are reflected in /usr/share/portage/config/repos.conf
as installed by newer portage
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | portage.Dockerfile | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -51,7 +51,7 @@ FROM gentoo/portage:latest as portage FROM gentoo/stage3-amd64:latest # copy the entire portage volume in -COPY --from=portage /usr/portage /usr/portage +COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo # continue with image build ... RUN emerge -qv www-servers/apache # or whichever packages you need diff --git a/portage.Dockerfile b/portage.Dockerfile index b795bd6..5da2631 100644 --- a/portage.Dockerfile +++ b/portage.Dockerfile @@ -23,8 +23,9 @@ RUN apk add --no-cache gnupg tar wget xz \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SIGNING_KEY} \ && gpg --verify "${SNAPSHOT}.gpgsig" "${SNAPSHOT}" \ && md5sum -c ${SNAPSHOT}.md5sum \ - && mkdir -p usr/portage/distfiles usr/portage/packages \ - && tar xJpf ${SNAPSHOT} -C usr \ + && mkdir -p var/db/repos var/cache/binpkgs var/cache/distfiles \ + && tar xJpf ${SNAPSHOT} -C var/db/repos \ + && mv var/db/repos/portage var/db/repos/gentoo \ && rm ${SNAPSHOT} ${SNAPSHOT}.gpgsig ${SNAPSHOT}.md5sum FROM busybox:latest @@ -32,4 +33,4 @@ FROM busybox:latest WORKDIR / COPY --from=builder /portage/ / CMD /bin/true -VOLUME /usr/portage +VOLUME /var/db/repos/gentoo |