commit: 9a5f0a1b5aa787dea46b81587caf39b373294b16
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 3 02:54:49 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 3 02:56:53 2026 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=9a5f0a1b
Rename 'portage' to 'gentoo'
Portage is Gentoo's main package manager. Don't say 'portage' when we
mean 'a snapshot of the ::gentoo repository'.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.github/actions/container_build/action.yml | 6 +++---
.github/workflows/{portage.yml => gentoo.yml} | 6 +++---
README.md | 2 +-
build.sh | 6 +++---
portage.Dockerfile => gentoo.Dockerfile | 10 +++++-----
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.github/actions/container_build/action.yml
b/.github/actions/container_build/action.yml
index 88b2853..066e6de 100644
--- a/.github/actions/container_build/action.yml
+++ b/.github/actions/container_build/action.yml
@@ -18,7 +18,7 @@ runs:
run: echo "TARGET=${{ inputs.target }}" | tee $GITHUB_ENV
shell: bash
- name: Build image
- if: startswith(inputs.target, 'stage3') || startswith(inputs.target,
'portage')
+ if: startswith(inputs.target, 'stage3') || startswith(inputs.target,
'gentoo')
shell: bash
run: ./build.sh
- name: Build python image
@@ -28,8 +28,8 @@ runs:
- name: Inspect image
shell: bash
run: docker image inspect "${ORG}/${TARGET/-/:}"
- - name: Inspect portage
- if: matrix.target != 'portage'
+ - name: Inspect gentoo
+ if: matrix.target != 'gentoo'
shell: bash
run: docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
- name: Login to DockerHub
diff --git a/.github/workflows/portage.yml b/.github/workflows/gentoo.yml
similarity index 93%
rename from .github/workflows/portage.yml
rename to .github/workflows/gentoo.yml
index 79d69c3..4db5289 100644
--- a/.github/workflows/portage.yml
+++ b/.github/workflows/gentoo.yml
@@ -1,4 +1,4 @@
-name: portage
+name: gentoo
on:
schedule:
@@ -10,13 +10,13 @@ env:
ORG: gentoo
jobs:
- portage:
+ gentoo:
# some boilerplate kept for alignment with build.yml
strategy:
fail-fast: false
matrix:
target:
- - portage
+ - gentoo
name: ${{ matrix.target }}
runs-on: ubuntu-latest
steps:
diff --git a/README.md b/README.md
index 9b98566..342824d 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ https://hub.docker.com/u/gentoo/
## Inventory
The following targets are built and pushed to Docker Hub:
- * `portage`
+ * `gentoo` (`::gentoo` repository)
* `stage3`
* `amd64`
* `stage3-amd64-hardened-openrc`
diff --git a/build.sh b/build.sh
index 0fabd00..2c752fa 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Used to create Gentoo stage3 and portage containers simply by specifying a
+# Used to create Gentoo stage3 and ::gentoo containers simply by specifying a
# TARGET env variable.
# Example usage: TARGET=stage3-amd64 ./build.sh
@@ -15,7 +15,7 @@ fi
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
VERSION=${VERSION:-$(date -u +%Y%m%d)}
-if [[ "${NAME}" == "portage" ]]; then
+if [[ "${NAME}" == "gentoo" ]]; then
VERSION_SUFFIX=":${VERSION}"
else
VERSION_SUFFIX="-${VERSION}"
@@ -56,7 +56,7 @@ case $ARCH in
MICROARCH="${ARCH}"
ARCH="s390"
;;
- *) # portage
+ *) # ::gentoo
DOCKER_ARCH="amd64"
;;
esac
diff --git a/portage.Dockerfile b/gentoo.Dockerfile
similarity index 89%
rename from portage.Dockerfile
rename to gentoo.Dockerfile
index aae59b3..b9fd460 100644
--- a/portage.Dockerfile
+++ b/gentoo.Dockerfile
@@ -2,16 +2,16 @@
# FIRST LINE IS VERY IMPORTANT. DO NOT MODIFY
-# This Dockerfile creates a portage snapshot that can be mounted as a
+# This Dockerfile creates a ::gentoo repository snapshot that can be mounted
as a
# container volume. It utilizes a multi-stage build and requires
# docker-17.05.0 or later. It fetches a daily snapshot from the official
# sources and verifies its checksum as well as its gpg signature.
FROM --platform=$BUILDPLATFORM alpine:3.23 as builder
-WORKDIR /portage
+WORKDIR /gentoo
-ARG SNAPSHOT="portage-latest.tar.xz"
+ARG SNAPSHOT="gentoo-latest.tar.xz"
ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/snapshots";
ARG SIGNING_KEY="0xDCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D"
@@ -46,7 +46,7 @@ RUN <<-EOF
md5sum -c -- ${SNAPSHOT}.md5sum
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
+ mv var/db/repos/gentoo var/db/repos/gentoo
rm -- ${SNAPSHOT} ${SNAPSHOT}.gpgsig ${SNAPSHOT}.md5sum
rm -- ${gpg_temp}/gpg.status
rmdir -- ${gpg_temp}
@@ -55,6 +55,6 @@ EOF
FROM busybox:latest
WORKDIR /
-COPY --from=builder /portage/ /
+COPY --from=builder /gentoo/ /
CMD /bin/true
VOLUME /var/db/repos/gentoo
