Add Alpine and Ubuntu Typst images

stack=ubuntu

Author: tarleb

.github/workflows/build.yaml

@@ -120,6 +120,10 @@ jobs:
         if: ${{ matrix.stack != 'static' }}
         run: make latex
 
+      - name: Build Typst image
+        if: ${{ matrix.stack != 'static' }}
+        run: make typst
+
       - name: Build extra image
         if: ${{ matrix.stack != 'static' }}
         run: make extra
@@ -147,6 +151,7 @@ jobs:
           make push-minimal
           if [ "$STACK" != 'static' ]; then
               make push-core
+              make push-typst
               make push-latex
               make push-extra
           fi

Makefile

@@ -69,15 +69,17 @@ $(1) $(1)-minimal $(1)-freeze-file: STACK = $(1)
 $(1): $(1)-minimal
 $(1)-minimal: minimal
 $(1)-freeze-file: $(1)/$(stack_freeze_file)
-# Only alpine and ubuntu support core, latex, and extra images
+# Only alpine and ubuntu support core, latex, typst, and extra images
 ifeq ($(1),$(filter $(1),alpine ubuntu))
 .PHONY: \
 		$(1)-core \
 		$(1)-latex \
+		$(1)-typst \
 		$(1)-extra
-$(1) $(1)-core $(1)-latex $(1)-extra: STACK = $(1)
+$(1) $(1)-core $(1)-latex $(1)-typst $(1)-extra: STACK = $(1)
 $(1)-core: core
 $(1)-latex: latex
+$(1)-typst: typst
 $(1)-extra: extra
 endif
 
@@ -168,6 +170,16 @@ latex: $(STACK)/$(stack_freeze_file)
 		-d "$(makefile_dir)" \
 		-t "$(STACK)-latex" \
 		$(docker_cpu_options)
+# Typst #################################################################
+.PHONY: typst
+typst: $(STACK)/$(stack_freeze_file)
+	./build.sh build -v \
+		-r typst \
+		-s "$(STACK)" \
+		-c "$(PANDOC_COMMIT)" \
+		-d "$(makefile_dir)" \
+		-t "$(STACK)-typst" \
+		$(docker_cpu_options)
 # Extra #################################################################
 .PHONY: extra
 extra: $(STACK)/$(stack_freeze_file)

alpine/Dockerfile

@@ -50,7 +50,7 @@ ARG extra_packages="pandoc-cli pandoc-crossref"
 # Build pandoc and pandoc-crossref. The `allow-newer` is required for
 # when pandoc-crossref has not been updated yet, but we want to build
 # anyway.
-RUN cabal build \
+RUN cabal update && cabal build \
       --allow-newer 'lib:pandoc' \
       --disable-tests \
       --disable-bench \
@@ -161,6 +161,11 @@ RUN echo "binary_x86_64-linuxmusl 1" >> /root/texlive.profile \
 
 WORKDIR /data
 
+# Typst #################################################################
+FROM alpine-core AS alpine-typst
+
+RUN apk --no-cache add typst
+
 # extra ##############################################################
 FROM alpine-latex AS alpine-extra
 

ubuntu/Dockerfile

@@ -161,6 +161,40 @@ RUN ( [ -z "$texlive_version"    ] || printf '-t\n%s\n"' "$texlive_version" \
 
 WORKDIR /data
 
+# typst ##############################################################
+FROM ubuntu-core as ubuntu-typst
+
+RUN set -eux; \
+    apt-get -q --no-allow-insecure-repositories update; \
+    apt-get install --assume-yes --no-install-recommends --mark-auto \
+        curl dpkg-dev tar; \
+    cd /tmp; \
+    ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
+    TYPST_GITHUB="https://github.com/typst/typst/releases/download/"; \
+    TYPST_VERSION="v0.11.1"; \
+    TYPST_BUILD="typst-${ARCH}-unknown-linux-musl"; \
+    TYPST_URL="$TYPST_GITHUB/$TYPST_VERSION/$TYPST_BUILD.tar.xz"; \
+    case "$ARCH" in \
+        ('aarch64') \
+            TYPST_SHA256='7f14f7fb37b26febffd13e683f90cdacddfde420d5fdc7f809228a78545c4b26'; \
+            ;; \
+        ('x86_64') \
+            TYPST_SHA256='bb637d1d65634b2ee4b4e101d0b2d541bf3f1e03ac5f51f9619941e48dd28bd0'; \
+            ;; \
+        (*) echo >&2 "error: unsupported architecture '$ARCH'"; \
+            exit 1 \
+            ;; \
+    esac; \
+    curl -sSL "$TYPST_URL" -o typst.tar.xz; \
+    echo "$TYPST_SHA256 typst.tar.xz" | sha256sum --strict --check; \
+    tar -xf typst.tar.xz \
+        -C /usr/local/bin \
+        --strip-components=1 \
+        "$TYPST_BUILD/typst"; \
+    apt-get autoremove --purge --assume-yes; \
+    rm typst.tar.xz; \
+    rm -rf /var/lib/apt/lists/*;
+
 # extra ##############################################################
 FROM ubuntu-latex AS ubuntu-extra