Skip to content
Snippets Groups Projects
Commit f226e3a9 authored by Olivier Benz's avatar Olivier Benz
Browse files

Merge branch 'master' into freeze-version

parents 8a6c159a cad00af2
No related branches found
No related tags found
No related merge requests found
<a href="https://benz0li.b-data.io/donate?project=1"><img src="https://benz0li.b-data.io/donate/static/donate-with-fosspay.png" alt="Donate with fosspay"></a> <a href="https://liberapay.com/benz0li/donate"><img src="https://liberapay.com/assets/widgets/donate.svg" alt="Donate using Liberapay" height="20"></a>
# GHC for pandoc
......@@ -19,6 +19,7 @@ RUN apk add --update --no-cache \
gnupg \
linux-headers \
libffi-dev \
llvm12 \
ncurses-dev \
perl \
python3 \
......@@ -60,7 +61,7 @@ RUN cd /tmp \
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install --allow-newer cabal-install-$CABAL_VERSION
FROM alpine:3.13 as builder
FROM alpine:3.15 as builder
LABEL org.label-schema.license="MIT" \
org.label-schema.vcs-url="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
......@@ -84,7 +85,7 @@ RUN apk add --update --no-cache \
libcurl \
libffi \
libffi-dev \
llvm10 \
llvm12 \
ncurses-dev \
ncurses-static \
openssl-dev \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment