Skip to content

Commit bd1d9e4

Browse files
tarlebtarleb
committed
Bump release of Alpine to 3.23.3
This includes an update of Typst to 0.14.2.
1 parent 2b93fbd commit bd1d9e4

File tree

6 files changed

+21
-57
lines changed

6 files changed

+21
-57
lines changed

‎3.8.2.1/alpine/Dockerfile‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,14 @@ FROM builder-base AS builder
3636
RUN git clone --branch=3.8.2.1 --depth=1 --quiet \
3737
https://github.com/jgm/pandoc /app
3838

39-
# Add pandoc-crossref to project
40-
RUN printf "extra-packages: pandoc-crossref\n" > cabal.project.local;
41-
42-
# Build pandoc and pandoc-crossref. The `allow-newer` is required for
43-
# when pandoc-crossref has not been updated yet, but we want to build
44-
# anyway.
39+
# Build the pandoc CLI binary.
4540
RUN cabal build \
4641
--jobs \
4742
--disable-tests \
4843
--disable-bench \
4944
--enable-split-sections \
5045
--enable-executable-stripping \
5146
--upgrade-dependencies \
52-
--allow-newer='pandoc-crossref:pandoc' \
5347
--ghc-options='-O1 -optc-Os -optl=-pthread -fPIC -j' \
5448
--ghc-options='+RTS -M4G -A128m -n2m -RTS' \
5549
--constraint='any.Cabal ==3.10.3.0' \
@@ -393,11 +387,11 @@ RUN cabal build \
393387
--constraint='zip-archive -executable' \
394388
--constraint='any.zlib ==0.7.1.1' \
395389
--constraint='zlib -bundled-c-zlib +non-blocking-ffi +pkg-config' \
396-
. pandoc-cli pandoc-crossref
390+
. pandoc-cli
397391

398392
# Cabal's exec stripping doesn't seem to work reliably, let's do it here.
399393
RUN find dist-newstyle \
400-
-name 'pandoc*' -type f -perm -u+x \
394+
-name 'pandoc' -type f -perm -u+x \
401395
-exec strip '{}' ';' \
402396
-exec cp '{}' /usr/local/bin/ ';'
403397

@@ -431,16 +425,3 @@ RUN ln -s /usr/local/bin/pandoc /usr/local/bin/pandoc-lua && \
431425
lua5.4 && \
432426
# Create user data directory
433427
mkdir -p "$XDG_DATA_HOME"/pandoc
434-
435-
# Core ##################################################################
436-
FROM minimal AS core
437-
COPY --from=builder \
438-
/usr/local/bin/pandoc-crossref \
439-
/usr/local/bin/
440-
441-
# Additional packages frequently used during conversions
442-
# NOTE: `libsrvg`, pandoc uses `rsvg-convert` for working with svg images.
443-
# FIXME: Alpine 3.17 and later ships the binary in the rsvg-convert package.
444-
# hadolint ignore=DL3018
445-
RUN apk --no-cache add librsvg; \
446-
apk --no-cache add rsvg-convert || true

‎3.8.2.1/debian/Dockerfile‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base ##################################################################
2-
FROM haskell:9.12-slim-bookworm AS builder-base
2+
FROM docker.io/haskell:9.12-slim-bookworm AS builder-base
33

44
ENV DEBIAN_FRONTEND=noninteractive
55
RUN apt-get -q --no-allow-insecure-repositories update && \
@@ -23,20 +23,14 @@ RUN git clone --branch=3.8.2.1 --depth=1 --quiet \
2323
https://github.com/jgm/pandoc /app
2424

2525
# Install Haskell dependencies
26-
# Add pandoc-crossref to project
27-
RUN printf "extra-packages: pandoc-crossref\n" > cabal.project.local;
28-
29-
# Build pandoc and pandoc-crossref. The `allow-newer` is required for
30-
# when pandoc-crossref has not been updated yet, but we want to build
31-
# anyway.
26+
# Build pandoc CLI binary.
3227
RUN cabal build \
3328
--jobs \
3429
--disable-tests \
3530
--disable-bench \
3631
--enable-split-sections \
3732
--enable-executable-stripping \
3833
--upgrade-dependencies \
39-
--allow-newer='pandoc-crossref:pandoc' \
4034
--ghc-options='-O1 -optc-Os -optl=-pthread -fPIC -j' \
4135
--ghc-options='+RTS -M4G -A128m -n2m -RTS' \
4236
--constraint='any.Cabal ==3.14.1.0' \
@@ -376,11 +370,11 @@ RUN cabal build \
376370
--constraint='zip-archive -executable' \
377371
--constraint='any.zlib ==0.7.1.1' \
378372
--constraint='zlib -bundled-c-zlib +non-blocking-ffi +pkg-config' \
379-
. pandoc-cli pandoc-crossref
373+
. pandoc-cli
380374

381375
# Cabal's exec stripping doesn't seem to work reliably, let's do it here.
382376
RUN find dist-newstyle \
383-
-name 'pandoc*' -type f -perm -u+x \
377+
-name 'pandoc' -type f -perm -u+x \
384378
-exec strip '{}' ';' \
385379
-exec cp '{}' /usr/local/bin/ ';'
386380

@@ -419,17 +413,3 @@ RUN ln -s /usr/local/bin/pandoc /usr/local/bin/pandoc-lua \
419413
&& rm -rf /var/lib/apt/lists/* \
420414
# Create user data directory
421415
&& mkdir -p "$XDG_DATA_HOME"/pandoc
422-
423-
# Core ##################################################################
424-
FROM minimal AS core
425-
COPY --from=builder \
426-
/usr/local/bin/pandoc-crossref \
427-
/usr/local/bin/
428-
429-
# Additional packages frequently used during conversions
430-
# NOTE: `libsrvg`, pandoc uses `rsvg-convert` for working with svg images.
431-
RUN apt-get -q --no-allow-insecure-repositories update \
432-
&& DEBIAN_FRONTEND=noninteractive \
433-
apt-get install --assume-yes --no-install-recommends \
434-
librsvg2-bin=2.* \
435-
&& rm -rf /var/lib/apt/lists/*

‎3.9/alpine/typst/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
FROM pandoc/core:3.9-alpine
2-
RUN apk --no-cache add typst=0.14.0-r0
2+
RUN apk --no-cache add typst=0.14.2-r0

‎3.9/debian/typst/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ RUN set -eux; \
1515
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
1616
TYPST_GITHUB="https://github.com/typst/typst/releases/download/"; \
1717
TYPST_BUILD="typst-${ARCH}-unknown-linux-musl"; \
18-
TYPST_VERSION="v0.14.0"; \
18+
TYPST_VERSION="v0.14.2"; \
1919
TYPST_URL="$TYPST_GITHUB/$TYPST_VERSION/$TYPST_BUILD.tar.xz"; \
2020
case "$ARCH" in \
2121
('aarch64') \
22-
TYPST_SHA256='3ad461772773256021ff38a0db3acf85f3ecdb00b93606a32f8c5ae043f6c62b'; \
22+
TYPST_SHA256='491b101aa40a3a7ea82a3f8a6232cabb4e6a7e233810082e5ac812d43fdcd47a'; \
2323
;; \
2424
('x86_64') \
25-
TYPST_SHA256='99816d2982de08d2b091bac56b59b2faa523a10e1378ad3cdd68e35b8eb74b3d'; \
25+
TYPST_SHA256='a6044cbad2a954deb921167e257e120ac0a16b20339ec01121194ff9d394996d'; \
2626
;; \
2727
(*) echo >&2 "error: unsupported architecture '$ARCH'"; \
2828
exit 1 \

‎3.9/ubuntu/typst/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ RUN set -eux; \
1515
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
1616
TYPST_GITHUB="https://github.com/typst/typst/releases/download/"; \
1717
TYPST_BUILD="typst-${ARCH}-unknown-linux-musl"; \
18-
TYPST_VERSION="v0.14.0"; \
18+
TYPST_VERSION="v0.14.2"; \
1919
TYPST_URL="$TYPST_GITHUB/$TYPST_VERSION/$TYPST_BUILD.tar.xz"; \
2020
case "$ARCH" in \
2121
('aarch64') \
22-
TYPST_SHA256='3ad461772773256021ff38a0db3acf85f3ecdb00b93606a32f8c5ae043f6c62b'; \
22+
TYPST_SHA256='491b101aa40a3a7ea82a3f8a6232cabb4e6a7e233810082e5ac812d43fdcd47a'; \
2323
;; \
2424
('x86_64') \
25-
TYPST_SHA256='99816d2982de08d2b091bac56b59b2faa523a10e1378ad3cdd68e35b8eb74b3d'; \
25+
TYPST_SHA256='a6044cbad2a954deb921167e257e120ac0a16b20339ec01121194ff9d394996d'; \
2626
;; \
2727
(*) echo >&2 "error: unsupported architecture '$ARCH'"; \
2828
exit 1 \

‎config.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ release:
4343
latex:
4444
texlive: '2025'
4545
typst:
46-
typst: '0.14.0'
46+
typst: '0.14.2'
4747
extra:
4848
eisvogel: '3.3.0'
4949
python:
@@ -56,8 +56,8 @@ release:
5656
- '3.8.3'
5757
- '3.8'
5858
base-image:
59-
alpine: '3.23.0'
60-
static: '3.23.0'
59+
alpine: '3.23.3'
60+
static: '3.23.3'
6161
ubuntu: 'noble'
6262
debian: 'bookworm'
6363
addon:
@@ -66,7 +66,7 @@ release:
6666
latex:
6767
texlive: '2025'
6868
typst:
69-
typst: '0.14.0'
69+
typst: '0.14.2'
7070
extra:
7171
eisvogel: '3.3.0'
7272
python:
@@ -190,6 +190,9 @@ addon:
190190

191191
typst:
192192
hashes:
193+
0.14.2:
194+
amd64: a6044cbad2a954deb921167e257e120ac0a16b20339ec01121194ff9d394996d
195+
arm64: 491b101aa40a3a7ea82a3f8a6232cabb4e6a7e233810082e5ac812d43fdcd47a
193196
0.14.0:
194197
amd64: 99816d2982de08d2b091bac56b59b2faa523a10e1378ad3cdd68e35b8eb74b3d
195198
arm64: 3ad461772773256021ff38a0db3acf85f3ecdb00b93606a32f8c5ae043f6c62b

0 commit comments

Comments
 (0)