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

Merge branch 'main' into freeze-version

parents 9f57676a 46a5de41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 1
View file @ 1be8eea3
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
GHC_VERSION_BUILD: "9.4.3" GHC_VERSION_BUILD: "9.4.4"
CABAL_VERSION_BUILD: "3.8.1.0" CABAL_VERSION_BUILD: "3.8.1.0"
before_script: before_script:
- *before-script-build - *before-script-build
......
latest.Dockerfile
+ 2
− 2
View file @ 1be8eea3
...@@ -52,7 +52,7 @@ RUN cd /tmp \ ...@@ -52,7 +52,7 @@ RUN cd /tmp \
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history # See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install --allow-newer cabal-install-$CABAL_VERSION && cabal install --allow-newer cabal-install-$CABAL_VERSION
FROM alpine:3.16 as builder FROM alpine:3.17 as builder
LABEL org.opencontainers.image.licenses="MIT" \ LABEL org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc4pandoc" \ org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc4pandoc" \
...@@ -81,7 +81,7 @@ RUN apk upgrade --no-cache \ ...@@ -81,7 +81,7 @@ RUN apk upgrade --no-cache \
libcurl \ libcurl \
libffi \ libffi \
libffi-dev \ libffi-dev \
llvm12 \ llvm14 \
ncurses-dev \ ncurses-dev \
ncurses-static \ ncurses-static \
openssl-dev \ openssl-dev \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment