@@ -25,11 +25,11 @@ jobs:
2525 run : |
2626 base_image_name="python"
2727 base_image_os_version="13"
28- base_image_os_codename="bookworm "
28+ base_image_os_codename="Bookworm "
2929 base_image_os_size="-slim"
3030 base_image_py_version="3.14"
3131
32- miktex_source_repository="${base_image_os_codename}"
32+ miktex_source_repository="${base_image_os_codename,, }"
3333
3434 image_name="miktex"
3535 image_tag="latest"
3939 base_image_os_version=${base_image_os_version}
4040 base_image_os_codename=${base_image_os_codename}
4141 base_image_py_version=${base_image_py_version}
42- base_image=${base_image_name}:${base_image_py_version}${base_image_os_size}-${base_image_os_codename}
42+ base_image=${base_image_name}:${base_image_py_version}${base_image_os_size}-${base_image_os_codename,, }
4343
4444 miktex_source_repository=${miktex_source_repository}
4545
@@ -66,25 +66,20 @@ jobs:
6666 RemoveComments() {
6767 local OutputFile="${2:-$1}"
6868
69- printf "%s \n" "Removing comments from '$1' and writing to '${OutputFile}'."
69+ printf "::group::${ANSI_LIGHT_BLUE}%s${ANSI_NOCOLOR} \n" "Removing comments from '$1' and writing to '${OutputFile}' .. ."
7070 grep -v '^\s*$\|^\s*\#' "$1" > "${OutputFile}"
71-
72- printf "%s\n" "${ANSI_BLUE}${OutputFile}${ANSI_NOCOLOR}"
73- printf "%s\n" "${ANSI_BLUE}--------------------------------------------------------------------------------${ANSI_NOCOLOR}"
74- while IFS='' read -r line; do
75- printf " %s\n" "${ANSI_CYAN}$line${ANSI_NOCOLOR}"
76- done < "${OutputFile}"
77- printf "%s\n" "${ANSI_BLUE}--------------------------------------------------------------------------------${ANSI_NOCOLOR}"
71+ cat "${OutputFile}" | sed 's/^/ /'
72+ printf "::endgroup::\n"
7873 }
7974
8075 DockerImageSizeUncompressed() {
8176 docker image inspect $1 --format='{{.Size}}' | numfmt --to=iec --format '%.2f'
8277 }
8378
84- printf "%s\n" "Convert 'Common.list' to 'Packages.list' ..."
79+ printf -- "Convert 'Common.list' to 'Packages.list' ...\n "
8580 RemoveComments Common.list Packages.list
8681
87- printf "%s\n" "Building docker file 'Dockerfile' ..."
82+ printf -- "Building docker file 'Dockerfile' ...\n "
8883 docker buildx build \
8984 --file Dockerfile \
9085 --build-arg IMAGE=${{ steps.variables.outputs.base_image }} \
@@ -112,24 +107,31 @@ jobs:
112107 . 2>&1 \
113108 | ./Docker.buildx.sh
114109 # check return codes from docker incase of error.
115-
116- printf -- "Labels of '${{ steps.variables.outputs.miktex_image }}':\n"
117- docker inspect --format='{{json .Config.Labels}}' "${{ steps.variables.outputs.miktex_image }}" | jq
118110
119- printf "%s \n" "Docker image ' ${{ steps.variables.outputs.miktex_image }}' has $(DockerImageSizeUncompressed ${{ steps.variables.outputs.miktex_image }})"
111+ printf -- "Docker image '%s' has %s \n" "${{ steps.variables.outputs.miktex_image }}" " $(DockerImageSizeUncompressed ${{ steps.variables.outputs.miktex_image }})"
120112
121113 - name : ☑ Checking MikTeX image '${{ steps.variables.outputs.miktex_image }}'
122114 run : |
123- printf "%s\n" "Docker image '${{ steps.variables.outputs.miktex_image }}' has $(DockerImageSizeUncompressed ${{ steps.variables.outputs.miktex_image }})"
115+ DockerImageSizeUncompressed() {
116+ docker image inspect $1 --format='{{.Size}}' | numfmt --to=iec --format '%.2f'
117+ }
118+
119+ printf -- "Docker image '%s' has %s\n" "${{ steps.variables.outputs.miktex_image }}" "$(DockerImageSizeUncompressed ${{ steps.variables.outputs.miktex_image }})"
120+ printf -- "Labels of '${{ steps.variables.outputs.miktex_image }}':\n"
121+ docker inspect --format='{{json .Config.Labels}}' "${{ steps.variables.outputs.miktex_image }}" | jq
124122
125123 docker container run --rm ${{ steps.variables.outputs.miktex_image }} 'printf "%s\n" "which pdflatex: $(which pdflatex)"'
126124
127125 - name : 🔑 Login and push '${{ steps.variables.outputs.miktex_image }}' to Docker Hub
128126 run : |
127+ DockerImageSizeUncompressed() {
128+ docker image inspect $1 --format='{{.Size}}' | numfmt --to=iec --format '%.2f'
129+ }
130+
129131 printf "%s\n" "Login at Docker Hub ..."
130132 printf "%s\n" "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ vars.DOCKERHUB_USERNAME }} --password-stdin
131133
132- printf "%s \n" "Docker image ' ${{ steps.variables.outputs.miktex_image }}' has $(DockerImageSizeUncompressed ${{ steps.variables.outputs.miktex_image }})"
134+ printf -- "Docker image '%s' has %s \n" "${{ steps.variables.outputs.miktex_image }}" " $(DockerImageSizeUncompressed ${{ steps.variables.outputs.miktex_image }})"
133135 docker image push ${{ steps.variables.outputs.miktex_image }}
134136
135137 Specific :
0 commit comments