From b8dfebc012b4ead43d7e073307bb43fcfe8c3d5c Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sun, 20 Oct 2024 17:13:33 +0200 Subject: [PATCH] Drop support for different Lua versions Pandoc requires Lua 5.4 nowadays. --- alpine/Dockerfile | 6 ++---- build.sh | 3 --- ubuntu/Dockerfile | 6 ++---- versions.md | 14 +++++++------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 06303f11..bb8c5983 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -3,7 +3,6 @@ ARG base_image_version=3.20 FROM alpine:$base_image_version AS alpine-builder-base WORKDIR /app -ARG lua_version=5.4 RUN apk --no-cache add \ alpine-sdk \ bash \ @@ -15,7 +14,7 @@ RUN apk --no-cache add \ gmp-dev \ libffi \ libffi-dev \ - lua$lua_version-dev \ + lua5.4-dev \ pkgconfig \ yaml \ zlib-dev @@ -66,7 +65,6 @@ RUN find dist-newstyle \ # Minimal ############################################################### FROM alpine:$base_image_version AS alpine-minimal ARG pandoc_version=edge -ARG lua_version=5.4 LABEL maintainer='Albert Krewinkel ' LABEL org.pandoc.maintainer='Albert Krewinkel ' LABEL org.pandoc.author "John MacFarlane" @@ -90,7 +88,7 @@ RUN ln -s /usr/local/bin/pandoc /usr/local/bin/pandoc-lua && \ apk --no-cache add \ gmp \ libffi \ - lua$lua_version + lua5.4 # Core ################################################################## FROM alpine-minimal AS alpine-core diff --git a/build.sh b/build.sh index d393ea69..2573884b 100755 --- a/build.sh +++ b/build.sh @@ -122,7 +122,6 @@ esac tag_versions=$(version_table_field 3) texlive_version=$(version_table_field 6) -lua_version=$(version_table_field 7) # Crossref extra_packages=pandoc-crossref @@ -148,7 +147,6 @@ if [ "$verbosity" -gt 0 ]; then printf '\tbase_image_version: %s\n' "$base_image_version" printf '\ttag_versions: %s\n' "$tag_versions" printf '\ttexlive_version: %s\n' "$texlive_version" - printf '\tlua_version: %s\n' "$lua_version" printf '\tverbosity: %s\n' "${verbosity}" printf '\textra_packages: %s\n' "$extra_packages" printf '\twithout_crossref: %s\n' "${without_crossref}" @@ -215,7 +213,6 @@ case "$action" in --build-arg base_image_version="${base_image_version}" \ --build-arg texlive_version="${texlive_version}" \ --build-arg texlive_mirror_url="${TEXLIVE_MIRROR_URL}" \ - --build-arg lua_version="${lua_version}" \ --target "${target}"\ -f "${directory}/${stack}/Dockerfile"\ "${directory}" diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 4e168e16..d8ea895e 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -2,7 +2,6 @@ ARG base_image_version=noble FROM ubuntu:$base_image_version AS ubuntu-builder-base -ARG lua_version=5.4 ENV DEBIAN_FRONTEND noninteractive RUN apt-get -q --no-allow-insecure-repositories update \ && apt-get install --assume-yes --no-install-recommends \ @@ -14,7 +13,7 @@ RUN apt-get -q --no-allow-insecure-repositories update \ git \ ghc=* \ libgmp-dev=2:6.* \ - liblua$lua_version-dev=* \ + liblua5.4-dev=* \ pkg-config=* \ zlib1g-dev=* \ && rm -rf /var/lib/apt/lists/* @@ -61,7 +60,6 @@ RUN find dist-newstyle \ # Minimal ############################################################### FROM ubuntu:$base_image_version AS ubuntu-minimal ARG pandoc_version=edge -ARG lua_version=5.4 LABEL maintainer='Albert Krewinkel ' LABEL org.pandoc.maintainer='Albert Krewinkel ' LABEL org.pandoc.author "John MacFarlane" @@ -86,7 +84,7 @@ RUN ln -s /usr/local/bin/pandoc /usr/local/bin/pandoc-lua \ && DEBIAN_FRONTEND=noninteractive \ apt-get install --assume-yes --no-install-recommends \ ca-certificates=\* \ - liblua$lua_version-0=\* \ + liblua5.4-0=\* \ libatomic1=\* \ libgmp10=\* \ libpcre3=\* \ diff --git a/versions.md b/versions.md index fd0a8875..7f5c8e04 100644 --- a/versions.md +++ b/versions.md @@ -1,7 +1,7 @@ -| pandoc | tags | Alpine | Ubuntu | TeXLive | Lua | -|----------+-------------------------------+--------+--------+---------+-----| -| main | edge | 3.20.3 | noble | | 5.4 | -| 3.5 | 3.5.0.0 3.5.0 3.5 3 latest | 3.20.3 | noble | 2024 | 5.4 | -| 3.4 | 3.4.0.0 3.4.0 3.4 | 3.20.3 | noble | 2024 | 5.4 | -| 3.3 | 3.3.0.0 3.3.0 3.3 | 3.20.3 | noble | 2024 | 5.4 | -| 3.2.1 | 3.2.1.0 3.2.1 3.2 | 3.19.4 | noble | 2024 | 5.4 | +| pandoc | tags | Alpine | Ubuntu | TeXLive | +|----------+-------------------------------+--------+--------+---------| +| main | edge | 3.20.3 | noble | | +| 3.5 | 3.5.0.0 3.5.0 3.5 3 latest | 3.20.3 | noble | 2024 | +| 3.4 | 3.4.0.0 3.4.0 3.4 | 3.20.3 | noble | 2024 | +| 3.3 | 3.3.0.0 3.3.0 3.3 | 3.20.3 | noble | 2024 | +| 3.2.1 | 3.2.1.0 3.2.1 3.2 | 3.19.4 | noble | 2024 |