Skip to content

Commit

Permalink
Drop support for different Lua versions
Browse files Browse the repository at this point in the history
Pandoc requires Lua 5.4 nowadays.
  • Loading branch information
tarleb committed Oct 20, 2024
1 parent 29e5ec6 commit b8dfebc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
6 changes: 2 additions & 4 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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 <albert+pandoc@tarleb.com>'
LABEL org.pandoc.maintainer='Albert Krewinkel <albert+pandoc@tarleb.com>'
LABEL org.pandoc.author "John MacFarlane"
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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}"
Expand Down
6 changes: 2 additions & 4 deletions ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/*
Expand Down Expand Up @@ -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 <albert+pandoc@tarleb.com>'
LABEL org.pandoc.maintainer='Albert Krewinkel <albert+pandoc@tarleb.com>'
LABEL org.pandoc.author "John MacFarlane"
Expand All @@ -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=\* \
Expand Down
14 changes: 7 additions & 7 deletions versions.md
Original file line number Diff line number Diff line change
@@ -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 |

0 comments on commit b8dfebc

Please sign in to comment.