ci(template): Backport upstream template fixes

There are a lot of outstanding changes from the project template, enough to make merging
significant work. Backport what we need to get a release out the door for now.

.github/workflows/build-test.yml

@@ -9,6 +9,8 @@ env:
   PGID: "1001"
   # Project specific values:
   PROJECT_NAMESPACE: "rpatterson"
+  # TEMPLATE: Cleanup once fixed entrypoint has been merged from the project template:
+  # fix(docker): Entrypoint user should not change
   PROJECT_NAME: "prunerr"
   GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
   GPG_SIGNING_PRIVATE_KEY: "${{ secrets.GPG_SIGNING_PRIVATE_KEY }}"

.gitlab-ci.yml

@@ -10,6 +10,9 @@ variables:
   PGID: "1001"
   # Project specific values:
   PROJECT_NAMESPACE: "rpatterson"
+  # TEMPLATE: Cleanup once fixed entrypoint has been merged from the project template:
+  # fix(docker): Entrypoint user should not change
+  PROJECT_NAME: "prunerr"
   # Uncomment to get more debugging output:
   # DEBUG: "true"
 

build-host/Dockerfile

@@ -57,6 +57,7 @@ RUN \
     "gettext" \
     "grep" \
     "py3-pip" \
+    "pipx" \
     "gnupg" \
     "curl" \
     "tar" \
@@ -68,8 +69,6 @@ RUN \
 COPY [ "./bin/install-codecov.sh", "${HOME}/.local/bin/" ]
 # hadolint ignore=DL3042,DL4006,SC1091
 RUN --mount=type=cache,target=/root/.cache,sharing=locked \
-    pip3 install --user "pipx==1.2.0" && \
-    python3 -m "pipx" ensurepath && \
     pipx install "tox==4.11.3" && \
     wget -qO- "https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh" | \
         bash && \

build-host/Makefile

@@ -20,7 +20,7 @@ COMMA=,
 # Done with `$(shell)`, echo recipe commands going forward
 .SHELLFLAGS+= -x
 
-DOCKER_IMAGE=merpatterson/prunerr
+DOCKER_IMAGE=registry.gitlab.com/rpatterson/prunerr
 
 ## Top-level targets
 

build-host/bin/init-job.sh

@@ -57,7 +57,7 @@ main() {
             docker_gid=$(stat -c "%g" "/var/run/docker.sock")
             if ! getent group ${docker_gid} >"/dev/null"
             then
-                addgroup -g "${docker_gid}" "docker"
+                addgroup -g "${docker_gid}" "build-host"
             fi
             if ! id -G "${user_name}" | grep -qw "${docker_gid}"
             then