Review feedback

Author: bthomee

.github/workflows/debian.yml

@@ -87,8 +87,8 @@ jobs:
             type=raw,value=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
           labels: |
-            org.opencontainers.image.authors=For inquiries, please use https://github.com/XRPLF/ci/issues
-            org.opencontainers.image.documentation=https://github.com/XRPLF/ci
+            org.opencontainers.image.authors=For inquiries, please use https://${{ github.repository }}/issues
+            org.opencontainers.image.documentation=https://${{ github.repository }}
             org.opencontainers.image.vendor=XRPLF
             org.opencontainers.image.title=${{ env.CONTAINER_REPOSITORY }}
       - name: Build and push the Docker image
@@ -108,19 +108,19 @@ jobs:
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}
           provenance: mode=max
-          push: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+          push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
           sbom: true
           labels: ${{ steps.meta.outputs.labels }}
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${DIGEST#sha256:}"
       - name: Upload digest
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         uses: actions/upload-artifact@v4
         with:
           name: digests-${{ matrix.os.release }}-${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-${{ env.PLATFORM_PAIR }}
@@ -129,7 +129,7 @@ jobs:
           retention-days: 1
 
   merge:
-    if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+    if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
     strategy:
       matrix:
         os:

.github/workflows/rhel.yml

@@ -78,8 +78,8 @@ jobs:
             type=raw,value=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
           labels: |
-            org.opencontainers.image.authors=For inquiries, please use https://github.com/XRPLF/ci/issues
-            org.opencontainers.image.documentation=https://github.com/XRPLF/ci
+            org.opencontainers.image.authors=For inquiries, please use https://${{ github.repository }}/issues
+            org.opencontainers.image.documentation=https://${{ github.repository }}
             org.opencontainers.image.vendor=XRPLF
             org.opencontainers.image.title=${{ env.CONTAINER_REPOSITORY }}
       - name: Build and push the Docker image
@@ -98,19 +98,19 @@ jobs:
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}
           provenance: mode=max
-          push: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+          push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
           sbom: true
           labels: ${{ steps.meta.outputs.labels }}
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${DIGEST#sha256:}"
       - name: Upload digest
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         uses: actions/upload-artifact@v4
         with:
           name: digests-${{ matrix.os.release }}-${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-${{ env.PLATFORM_PAIR }}
@@ -119,7 +119,7 @@ jobs:
           retention-days: 1
 
   merge:
-    if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+    if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
     strategy:
       matrix:
         os:

.github/workflows/ubuntu.yml

@@ -85,8 +85,8 @@ jobs:
             type=raw,value=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
           labels: |
-            org.opencontainers.image.authors=For inquiries, please use https://github.com/XRPLF/ci/issues
-            org.opencontainers.image.documentation=https://github.com/XRPLF/ci
+            org.opencontainers.image.authors=For inquiries, please use https://${{ github.repository }}/issues
+            org.opencontainers.image.documentation=https://${{ github.repository }}
             org.opencontainers.image.vendor=XRPLF
             org.opencontainers.image.title=${{ env.CONTAINER_REPOSITORY }}
       - name: Build and push the Docker image
@@ -106,19 +106,19 @@ jobs:
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}
           provenance: mode=max
-          push: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+          push: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
           sbom: true
           labels: ${{ steps.meta.outputs.labels }}
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${DIGEST#sha256:}"
       - name: Upload digest
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         uses: actions/upload-artifact@v4
         with:
           name: digests-${{ matrix.os.release }}-${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-${{ env.PLATFORM_PAIR }}
@@ -127,7 +127,7 @@ jobs:
           retention-days: 1
 
   merge:
-    if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
+    if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
     strategy:
       matrix:
         os:

docker/debian/Dockerfile

@@ -17,10 +17,6 @@ FROM debian:${DEBIAN_VERSION} AS base
 SHELL ["/bin/bash", "-c"]
 ENTRYPOINT ["/bin/bash"]
 
-# Associate the image with the repository.
-ARG GITHUB_REPO
-LABEL org.opencontainers.image.source=https://github.com/${GITHUB_REPO}
-
 # Ensure any packages installed directly or indirectly via dpkg do not require
 # manual interaction.
 ARG DEBIAN_FRONTEND=noninteractive
@@ -118,7 +114,6 @@ set -ex
 curl --no-progress-meter https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/keyrings/llvm.gpg
 printf "%s\n%s\n" \
   "deb [signed-by=/etc/apt/keyrings/llvm.gpg] https://apt.llvm.org/${DEBIAN_VERSION}/ llvm-toolchain-${DEBIAN_VERSION}-${CLANG_VERSION} main" \
-  "deb-src [signed-by=/etc/apt/keyrings/llvm.gpg] https://apt.llvm.org/${DEBIAN_VERSION}/ llvm-toolchain-${DEBIAN_VERSION}-${CLANG_VERSION} main" \
   | tee /etc/apt/sources.list.d/llvm.list
 apt update
 apt install -t llvm-toolchain-${DEBIAN_VERSION}-${CLANG_VERSION} -y --no-install-recommends clang-${CLANG_VERSION} llvm-${CLANG_VERSION}

docker/debian/README.md

@@ -37,12 +37,11 @@ Ensure you've run the login command above to authenticate with the Docker
 registry.
 
 ```shell
-GITHUB_REPO=XRPLF/ci
 NONROOT_USER=${USER}
 DEBIAN_VERSION=bookworm
 GCC_VERSION=12
 CONAN_VERSION=2.17.0
-CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc${GCC_VERSION}
+CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
 
 DOCKER_BUILDKIT=1 docker build . \
   --target gcc \
@@ -51,7 +50,6 @@ DOCKER_BUILDKIT=1 docker build . \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
   --build-arg GCC_VERSION=${GCC_VERSION} \
-  --build-arg GITHUB_REPO=${GITHUB_REPO} \
   --build-arg NONROOT_USER=${NONROOT_USER} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
 ```
@@ -62,12 +60,11 @@ Ensure you've run the login command above to authenticate with the Docker
 registry.
 
 ```shell
-GITHUB_REPO=XRPLF/ci
 NONROOT_USER=${USER}
 DEBIAN_VERSION=bookworm
 CLANG_VERSION=17
 CONAN_VERSION=2.17.0
-CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang${CLANG_VERSION}
+CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
 
 DOCKER_BUILDKIT=1 docker build . \
   --target clang \
@@ -76,7 +73,6 @@ DOCKER_BUILDKIT=1 docker build . \
   --build-arg CLANG_VERSION=${CLANG_VERSION} \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
-  --build-arg GITHUB_REPO=${GITHUB_REPO} \
   --build-arg NONROOT_USER=${NONROOT_USER} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
 ```

docker/rhel/Dockerfile

@@ -10,17 +10,10 @@ RUN dnf -y install bison flex
 # ====================== BASE IMAGE ======================
 FROM registry.redhat.io/ubi${RHEL_VERSION%.*}/s2i-base:${RHEL_VERSION} AS base
 
-# Change to the root user to install packages.
-USER root
-
 # Use Bash as the default shell for RUN commands and as the entrypoint.
 SHELL ["/bin/bash", "-c"]
 ENTRYPOINT ["/bin/bash"]
 
-# Associate the image with the repository.
-ARG GITHUB_REPO
-LABEL org.opencontainers.image.source=https://github.com/${GITHUB_REPO}
-
 # Update the packages installed on the system.
 RUN dnf -y update-minimal --security --sec-severity=Important --sec-severity=Critical
 

docker/rhel/README.md

@@ -56,20 +56,18 @@ Ensure you've run the login command above to authenticate with the Docker
 registry.
 
 ```shell
-GITHUB_REPO=XRPLF/ci
 NONROOT_USER=${USER}
 RHEL_VERSION=9.6
 GCC_VERSION=13
 CONAN_VERSION=2.17.0
-CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc${GCC_VERSION}
+CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc-${GCC_VERSION}
 
 DOCKER_BUILDKIT=1 docker build . \
   --target gcc \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg GCC_VERSION=${GCC_VERSION} \
-  --build-arg GITHUB_REPO=${GITHUB_REPO} \
   --build-arg NONROOT_USER=${NONROOT_USER} \
   --build-arg RHEL_VERSION=${RHEL_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
@@ -81,18 +79,16 @@ Ensure you've run the login command above to authenticate with the Docker
 registry.
 
 ```shell
-GITHUB_REPO=XRPLF/ci
 NONROOT_USER=${USER}
 RHEL_VERSION=9.6
 CONAN_VERSION=2.17.0
-CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang${CLANG_VERSION}
+CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang-${CLANG_VERSION}
 
 DOCKER_BUILDKIT=1 docker build . \
   --target clang \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
-  --build-arg GITHUB_REPO=${GITHUB_REPO} \
   --build-arg NONROOT_USER=${NONROOT_USER} \
   --build-arg RHEL_VERSION=${RHEL_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}

docker/ubuntu/Dockerfile

@@ -6,10 +6,6 @@ FROM ubuntu:${UBUNTU_VERSION} AS base
 SHELL ["/bin/bash", "-c"]
 ENTRYPOINT ["/bin/bash"]
 
-# Associate the image with the repository.
-ARG GITHUB_REPO
-LABEL org.opencontainers.image.source=https://github.com/${GITHUB_REPO}
-
 # Ensure any packages installed directly or indirectly via dpkg do not require
 # manual interaction.
 ARG DEBIAN_FRONTEND=noninteractive

docker/ubuntu/README.md

@@ -37,20 +37,18 @@ Ensure you've run the login command above to authenticate with the Docker
 registry.
 
 ```shell
-GITHUB_REPO=XRPLF/ci
 NONROOT_USER=${USER}
 UBUNTU_VERSION=noble
 GCC_VERSION=14
 CONAN_VERSION=2.17.0
-CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc${GCC_VERSION}
+CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc-${GCC_VERSION}
 
 DOCKER_BUILDKIT=1 docker build . \
   --target gcc \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg GCC_VERSION=${GCC_VERSION} \
-  --build-arg GITHUB_REPO=${GITHUB_REPO} \
   --build-arg NONROOT_USER=${NONROOT_USER} \
   --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
@@ -62,20 +60,18 @@ Ensure you've run the login command above to authenticate with the Docker
 registry.
 
 ```shell
-GITHUB_REPO=XRPLF/ci
 NONROOT_USER=${USER}
 UBUNTU_VERSION=noble
 CLANG_VERSION=18
 CONAN_VERSION=2.17.0
-CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang${CLANG_VERSION}
+CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
 
 DOCKER_BUILDKIT=1 docker build . \
   --target clang \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --build-arg CLANG_VERSION=${CLANG_VERSION} \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
-  --build-arg GITHUB_REPO=${GITHUB_REPO} \
   --build-arg NONROOT_USER=${NONROOT_USER} \
   --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}