Fixed Sphinx variant.

Author: Paebbels

.github/workflows/Pipeline.yml

@@ -125,7 +125,9 @@ jobs:
           
           docker container run --rm ${{ steps.variables.outputs.miktex_image }} bash -c 'printf "%s\n" "which pdflatex: $(which pdflatex) ($(pdflatex --version | head -n 1))"'
           MIKTEX_VERSION="$(docker container run --rm ${{ steps.variables.outputs.miktex_image }} bash -c "miktex --version | head -n 1")"
-          printf -- "MikTeX version: -%s-\n" "${MIKTEX_VERSION}"
+          
+          printf -- "MikTeX version (raw): %s\n" "${MIKTEX_VERSION}"
+          MIKTEX_VERSION="$(echo "${MIKTEX_VERSION}" | grep -oP '\(MiKTeX \d+\.\d+\)' | grep -oP '\d+\.\d+')"
           
           tee "${GITHUB_OUTPUT}" <<EOF
           miktex_version=${MIKTEX_VERSION}
@@ -177,51 +179,67 @@ jobs:
           ANSI_BLUE=$'\x1b[34m'
           ANSI_CYAN=$'\x1b[36m'
           ANSI_DARK_GRAY=$'\x1b[90m'
+          ANSI_LIGHT_BLUE=$'\x1b[94m'
           ANSI_NOCOLOR=$'\x1b[0m'
           
           RemoveComments() {
             local OutputFile="${2:-$1}"
         
-            printf "%s\n" "Removing comments from '$1' and writing to '${OutputFile}'."
+            printf "::group::${ANSI_LIGHT_BLUE}%s${ANSI_NOCOLOR}\n" "Removing comments from '$1' and writing to '${OutputFile}' ..."
             grep -v '^\s*$\|^\s*\#' "$1" > "${OutputFile}"
-        
-            printf "%s\n" "${ANSI_BLUE}${OutputFile}${ANSI_NOCOLOR}"
-            printf "%s\n" "${ANSI_BLUE}--------------------------------------------------------------------------------${ANSI_NOCOLOR}"
-            while IFS='' read -r line; do
-              printf "  %s\n" "${ANSI_CYAN}$line${ANSI_NOCOLOR}"
-            done < "${OutputFile}"
-            printf "%s\n" "${ANSI_BLUE}--------------------------------------------------------------------------------${ANSI_NOCOLOR}"
+            cat "${OutputFile}" | sed 's/^/  /'
+            printf "::endgroup::\n"
           }
 
           DockerImageSizeUncompressed() {
             docker image inspect $1 --format='{{.Size}}' | numfmt --to=iec --format '%.2f'
           }
 
-          printf "%s\n" "Convert '${{ matrix.name }}.list' to 'Packages.list' ..."
+          printf -- "Convert '${{ matrix.name }}.list' to 'Packages.list' ...\n"
           RemoveComments ${{ matrix.name }}.list Packages.list
 
-          printf "%s\n" "Building docker file 'Dockerfile' ..."
+          printf -- "Building docker file 'Dockerfile' ...\n"
           docker buildx build \
             --file Dockerfile.Specific \
             --build-arg "IMAGE=${{ needs.MikTeX.outputs.miktex_image }}" \
-            --build-arg "BASE_VARIANT=Debian ${{ needs.MikTeX.outputs.base_image_os_version }} with Python ${{ needs.MikTeX.outputs.base_image_py_version }}" \
-            --build-arg "VARIANT=${{ matrix.name }}" \
+            --label "org.opencontainers.image.title=MikTeX specific for ${{ matrix.name }} on Debian ${{ steps.variables.outputs.base_image_os_version }} (${{ steps.variables.outputs.base_image_os_codename }}) + Python ${{ steps.variables.outputs.base_image_py_version }}" \
+            --label "org.opencontainers.image.description=MikTeX specific for ${{ matrix.name }} on Debian ${{ steps.variables.outputs.base_image_os_version }} (${{ steps.variables.outputs.base_image_os_codename }}) + Python ${{ steps.variables.outputs.base_image_py_version }} image maintained by pyTooling Authors." \
+            --label "org.opencontainers.image.authors=Patrick Lehmann <Paebbels@gmail.com>" \
+            --label "org.opencontainers.image.vendor=pyTooling" \
+            --label "org.opencontainers.image.version=1.0" \
+            --label "org.opencontainers.image.revison=${GITHUB_SHA}" \
+            --label "org.opencontainers.image.created=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
+            --label "org.opencontainers.image.url=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \
+            --label "org.opencontainers.image.source=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
+            --label "org.opencontainers.image.documentation=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/blob/main/README.md" \
+            --label "org.opencontainers.image.license=MIT" \
+            --label "pyTooling.dockerimages.application.variant=${{ matrix.name }}" \
             --tag "${{ steps.variables.outputs.specific_image }}" \
             . 2>&1 \
           | ./Docker.buildx.sh
 
-          printf "%s\n" "Docker image '${{ steps.variables.outputs.specific_image }}' has $(DockerImageSizeUncompressed ${{ steps.variables.outputs.specific_image }})"
+          printf -- "Docker image '%s' has %s\n" "${{ steps.variables.outputs.specific_image }}" "$(DockerImageSizeUncompressed ${{ steps.variables.outputs.specific_image }})"
 
       - name: ☑ Checking MikTeX image '${{ steps.variables.outputs.specific_image }}'
         run: |
-          printf "%s\n" "Docker image '${{ steps.variables.outputs.specific_image }}' has $(DockerImageSizeUncompressed ${{ steps.variables.outputs.specific_image }})"
+          DockerImageSizeUncompressed() {
+            docker image inspect $1 --format='{{.Size}}' | numfmt --to=iec --format '%.2f'
+          }
           
-          docker container run --rm ${{ steps.variables.outputs.specific_image }} 'printf "%s\n" "which pdflatex: $(which pdflatex)"'
+          printf -- "Docker image '%s' has %s\n" "${{ steps.variables.outputs.specific_image }}" "$(DockerImageSizeUncompressed ${{ steps.variables.outputs.specific_image }})"
+          printf -- "Labels of '${{ steps.variables.outputs.miktex_image }}':\n"
+          docker inspect --format='{{json .Config.Labels}}' "${{ steps.variables.outputs.miktex_image }}" | jq
+          
+          docker container run --rm ${{ steps.variables.outputs.specific_image }} bash -c 'xelatex --version'
 
       - name: 🔑 Login and push '${{ steps.variables.outputs.specific_image }}' to Docker Hub
         run: |
-          printf "%s\n" "Login at Docker Hub ..."
+          DockerImageSizeUncompressed() {
+            docker image inspect $1 --format='{{.Size}}' | numfmt --to=iec --format '%.2f'
+          }
+          
+          printf -- "Login at Docker Hub ...\n"
           printf "%s\n" "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ vars.DOCKERHUB_USERNAME }} --password-stdin
         
-          printf "%s\n" "Docker image '${{ steps.variables.outputs.specific_image }}' has $(DockerImageSizeUncompressed ${{ steps.variables.outputs.specific_image }})"
+          printf -- "Docker image '%s' has %s\n" "${{ steps.variables.outputs.specific_image }}" "$(DockerImageSizeUncompressed ${{ steps.variables.outputs.specific_image }})"
           docker image push ${{ steps.variables.outputs.specific_image }}