Commit f688eb35 authored by Roman Lacko's avatar Roman Lacko
Browse files

Merge branch 'v2020.0.0' into 'master' 

Update distro, add new GHC versions, drop 8.2 & 8.0

See merge request unix/ci-images/haskell-ib015!4
parents f8ae4ce5 912b13ef

Dockerfile

+18 −14
Original line number Diff line number Diff line 
FROM debian:buster

FROM debian:bullseye



# The following is taken from the 'haskell-8.6.5' Dockerfile

# The following originates from the 'haskell-8.6.5' Dockerfile

ENV LANG            C.UTF-8

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \

    apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git && \

    echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \

    apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git

RUN echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \

    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574 && \

    apt-get update && \

    apt-get install -y --no-install-recommends ghc-8.6.5 cabal-install-2.4 \

        zlib1g-dev libtinfo-dev libsqlite3-dev g++ netbase xz-utils make && \

    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.3/stack-1.9.3-linux-x86_64.tar.gz -o stack.tar.gz && \

    apt-get update

RUN apt-get install -y --no-install-recommends \

        zlib1g-dev libtinfo-dev libsqlite3-dev g++ netbase xz-utils make

RUN apt-get install -y --no-install-recommends \

          ghc-8.4.4 ghc-8.6.5 ghc-8.8.3 ghc-8.10.1 cabal-install-3.2

RUN curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.3/stack-1.9.3-linux-x86_64.tar.gz -o stack.tar.gz && \

    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.3/stack-1.9.3-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \

    export GNUPGHOME="$(mktemp -d)" && \

    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys C5705533DA4F78D8664B5DC0575159689BEFB442 && \
@@ -18,16 +21,15 @@ RUN apt-get update && \ 
    /usr/local/bin/stack config set system-ghc --global true && \

    /usr/local/bin/stack config set install-ghc --global false && \

    rm -rf "$GNUPGHOME" /var/lib/apt/lists/* /stack.tar.gz.asc /stack.tar.gz

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/cabal/2.4/bin:/opt/ghc/8.6.5/bin:$PATH

# End of code taken from 'haskell'

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/cabal/3.2/bin:/opt/ghc/8.10.1/bin:$PATH:/opt/ghc/8.8.3/bin:/opt/ghc/8.6.5/bin:/opt/ghc/8.4.4/bin



ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \

    apt-get install -y --no-install-recommends \

        texlive texlive-publishers texlive-lang-czechslovak texlive-pictures \

        texlive-fonts-extra texlive-xetex fonts-liberation texlive-science \

        texlive-generic-extra texlive-latex-extra texlive-latex-recommended \

        lmodern latexmk make rubber hlint zip swi-prolog graphviz inkscape \

        texlive-plain-generic texlive-latex-extra texlive-latex-recommended \

        lmodern latexmk make rubber \

        hlint zip swi-prolog graphviz inkscape \

        dot2tex python3-pkg-resources python3-yaml python3-pip pandoc-citeproc \

        python3-pygments rsync ssh ca-certificates wget locales
@@ -42,6 +44,8 @@ RUN echo "Europe/Prague" > /etc/timezone && \ 


ENV LANG en_US.UTF-8



RUN cabal v1-update && cabal v1-install pandoc-2.7 QuickCheck HUnit

RUN cabal v1-update && cabal v1-install pandoc-2.10 QuickCheck HUnit data-default-class



RUN for GHC in ghc-8.4.4 ghc-8.6.5 ghc-8.8.3 ghc-8.10.1; do cabal v1-install --with-ghc $GHC HUnit QuickCheck; done



CMD ["bash"]

Makefile

+4 −2
Original line number Diff line number Diff line 
DOCKER  = docker

IMAGE   = haskell-ib015

TAG     = v1.3

TAG     = v2020.0.0



-include local.make



all: Dockerfile

	$(DOCKER) build -t '$(IMAGE):$(TAG)' .

	$(DOCKER) build $(DOCKEROPTS) -t '$(IMAGE):$(TAG)' .

	$(DOCKER) tag '$(IMAGE):$(TAG)' '$(IMAGE):latest'