From 91f2bcfe73fa3a489654ee74bca02e24423dc5c0 Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <albert@zeitkraut.de>
Date: Tue, 10 Mar 2020 11:59:06 +0100
Subject: linux/Dockerfile: upgrade to alpine 3.11

Closes: #6180
---
 linux/Dockerfile | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'linux')

diff --git a/linux/Dockerfile b/linux/Dockerfile
index ca48d07f8..f577d8765 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -1,14 +1,21 @@
 # USE ALPINE LINUX
-FROM alpine:3.10
-RUN apk update
-RUN apk add alpine-sdk git ca-certificates ghc gmp-dev zlib-dev bash dpkg fakeroot cabal
-RUN mkdir -p /usr/src/
-WORKDIR /usr/src/
-RUN git clone https://github.com/jgm/pandoc
+FROM alpine:3.11
+RUN apk --no-cache add \
+      alpine-sdk \
+      bash \
+      ca-certificates \
+      cabal \
+      dpkg \
+      fakeroot \
+      ghc \
+      git \
+      gmp-dev \
+      xz \
+      zlib-dev \
+      zlib-static
+RUN mkdir -p /usr/src/ && \
+    git clone https://github.com/jgm/pandoc /usr/src/pandoc
 WORKDIR /usr/src/pandoc
-RUN cabal update && \
-    cabal install cabal-install-2.4.0.0 && \
-    cp $HOME/.cabal/bin/cabal /usr/bin/
 CMD cabal --version && \
     ghc --version && \
     git pull && \
-- 
cgit v1.2.3