Update base-image to include ghc-8.8.3 & 8.10.1

Author: hvr

worker-setup/build.sh

@@ -1,19 +1,19 @@
 #!/bin/bash -e
 
-mkdir -p bin
+mkdir -p worker/bin
 
 # cabal executable
-if [ ! -x bin/cabal ]; then
+if [ ! -x worker/bin/cabal ]; then
   echo "missing cabal executable"
   exit 1
 fi
 
 # worker
 cabal v2-build exe:matrix-worker
-cp -v "$(cabal new-exec which -- matrix-worker)" bin/
-strip -v bin/matrix-worker
+cp -v "$(cabal new-exec which -- matrix-worker)" ./worker/bin/
+strip -v worker/bin/matrix-worker
 
 # 
-docker build -t matrix-worker-base -f base.Dockerfile .
-docker build -t matrix-worker .
+docker build -t matrix-worker-base ./worker-base
+docker build -t matrix-worker      ./worker
 

worker-setup/base.Dockerfile worker-setup/worker-base/Dockerfileworker-setup/base.Dockerfile renamed to worker-setup/worker-base/Dockerfile

@@ -1,26 +1,46 @@
 FROM ubuntu:16.04 AS matrix-worker-base
-RUN apt-get update && apt-get install -y gnupg
-RUN echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main' > /etc/apt/sources.list.d/ghc.list && \
-    echo 'deb http://ppa.launchpad.net/hvr/matrix.hackage/ubuntu xenial main' > /etc/apt/sources.list.d/hackageci.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys FF3AEACEF6F88286
-RUN echo 2 && apt-get update && apt-get dist-upgrade -y && apt-get autoremove -y --purge && apt-get clean
-# locale stuff
-RUN apt-get -y install locales && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen && apt-get clean
+
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+
+RUN apt-get update \
+ && apt-get install -y gnupg \
+ && rm -rf /var/lib/apt/lists/* \
+ && echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main' > /etc/apt/sources.list.d/ghc.list \
+ && echo 'deb http://ppa.launchpad.net/hvr/matrix.hackage/ubuntu xenial main' > /etc/apt/sources.list.d/hackageci.list \
+ && apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys FF3AEACEF6F88286 \
+ && apt-get update \
+ && apt-get dist-upgrade -y \
+ && apt-get -y install locales \
+ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
+ && locale-gen \
+ && apt-get autoremove -y --purge \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
 # toolchain & FFI libraries [A]
-RUN apt-get install -y m4 build-essential && apt-get clean
-RUN apt-get install -y \
+RUN apt-get update \
+ && apt-get install -y \
+        build-essential \
         freeglut3-dev \
         libadns1-dev \
+        libalut-dev \
+        libarchive-dev \
+        libarrayfire-dev \
         libasound2-dev \
+        libavdevice-dev \
+        libbabl-dev \
         libbibutils-dev \
         libblas-dev \
+        libbrotli-dev \
         libbz2-dev \
         libcairo2-dev \
         libcrypto++-dev \
+        libdbusmenu-gtk3-dev \
         libdevil-dev \
         libedit-dev \
+        libfdk-aac-dev \
         libfftw3-dev \
+        libflint-dev \
         libfreenect-dev \
         libfreenect-dev \
         libftgl-dev \
@@ -31,30 +51,39 @@ RUN apt-get install -y \
         libgd2-xpm-dev \
         libgeoip-dev \
         libgirepository1.0-dev \
+        libgit2-dev \
+        libglade2-dev \
         libglew-dev \
         libglib2.0-dev \
         libglpk-dev \
         libglu1-mesa-dev \
         libgmp-dev \
         libgpgme11-dev \
+        libgsasl7-dev \
         libgsl-dev \
         libgsl0-dev \
         libgtk-3-dev \
         libgtk2.0-dev \
+        libgtkglext1-dev \
+        libgtksourceview-3.0-dev \
+        libgtksourceview2.0-dev \
         libhidapi-dev \
         libhidapi-dev \
         libicu-dev \
         libjack-dev \
+        libjavascriptcoregtk-4.0-dev \
         libjudy-dev \
         libkrb5-dev \
         liblapack-dev \
         libldap2-dev \
         libleveldb-dev \
         libleveldb-dev \
         liblmdb-dev \
+        liblz-dev \
         liblz4-dev \
         liblzma-dev \
         libmagic-dev \
+        libmagickwand-dev \
         libmarkdown2-dev \
         libmp3lame-dev \
         libmpfr-dev \
@@ -76,17 +105,24 @@ RUN apt-get install -y \
         libqrencode-dev \
         librdkafka-dev \
         libre2-dev \
+        librsvg2-dev \
+        librubberband-dev \
         libsctp-dev \
         libsdl-gfx1.2-dev \
         libsdl-ttf2.0-dev \
         libsdl1.2-dev \
         libsdl2-dev \
+        libsdl2-gfx-dev \
+        libsdl2-image-dev \
+        libsdl2-mixer-dev \
+        libsdl2-net-dev \
         libsdl2-ttf-dev \
         libsecp256k1-dev \
         libsndfile1-dev \
         libsnmp-dev \
         libsnmp-dev \
         libsodium-dev \
+        libsox-dev \
         libsqlite3-dev \
         libssh-dev \
         libssl-dev \
@@ -95,7 +131,13 @@ RUN apt-get install -y \
         libtagc0-dev \
         libtwolame-dev \
         libudev-dev \
+        libuv1-dev \
+        libvirt-dev \
         libvte-2.91-dev \
+        libwebkit-dev \
+        libwebkit2gtk-4.0-dev \
+        libwebkitgtk-3.0-dev \
+        libwnck-3-dev \
         libwxgtk-media3.0-dev \
         libwxgtk-webview3.0-dev \
         libxml2-dev \
@@ -108,55 +150,22 @@ RUN apt-get install -y \
         libzmq-dev \
         libzookeeper-mt-dev \
         lzma-dev \
+        m4 \
         mpi-default-dev \
         nettle-dev \
+        portaudio19-dev \
+        r-base-core \
         ruby-dev \
         unixodbc-dev \
         uuid-dev \
         zlib1g-dev \
-        libgit2-dev \
-    && apt-get autoremove -y --purge && apt-get clean
-
-# recheck for updated dists
-RUN echo 2 && apt-get update && apt-get dist-upgrade -y
-
-# 2nd iteration
-RUN apt-get install -y \
-        libalut-dev \
-        libarchive-dev \
-        libavdevice-dev \
-        libbabl-dev \
-        libbrotli-dev \
-        libdbusmenu-gtk3-dev \
-        libfdk-aac-dev \
-        libflint-dev \
-        libglade2-dev \
-        libgsasl7-dev \
-        libgtkglext1-dev \
-        libgtksourceview-3.0-dev \
-        libgtksourceview2.0-dev \
-        libjavascriptcoregtk-4.0-dev \
-        liblz-dev \
-        libmagickwand-dev \
-        librsvg2-dev \
-        librubberband-dev \
-        libsdl2-gfx-dev \
-        libsdl2-image-dev \
-        libsdl2-mixer-dev \
-        libsdl2-net-dev \
-        libsox-dev \
-        libuv1-dev \
-        libvirt-dev \
-        libwebkit-dev \
-        libwebkit2gtk-4.0-dev \
-        libwebkitgtk-3.0-dev \
-        libwnck-3-dev \
-        portaudio19-dev \
-        r-base-core \
-    && apt-get autoremove -y --purge && apt-get clean
+ && apt-get autoremove -y --purge \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
 
 # GHC toolchains
-RUN apt-get install -y \
+RUN apt-get update \
+ && apt-get install -y \
         ghc-7.0.4  \
         ghc-7.4.2  \
         ghc-7.6.3  \
@@ -166,9 +175,7 @@ RUN apt-get install -y \
         ghc-8.2.2  \
         ghc-8.4.4  \
         ghc-8.6.5  \
-        ghc-8.8.1  \
-    && apt-get clean
-
-# add-ons -- to be moved to the front at some point
-#RUN apt-get install -y libalut-dev libflint-dev libdbusmenu-gtk3-dev libuv1-dev libbrotli-dev liblz-dev \
-# && apt-get autoremove -y --purge && apt-get clean
+        ghc-8.8.3  \
+        ghc-8.10.1  \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*

worker-setup/Dockerfile worker-setup/worker/Dockerfileworker-setup/Dockerfile renamed to worker-setup/worker/Dockerfile

@@ -12,7 +12,8 @@ ADD ./xghc-8.x /opt/ghc/8.0.2/bin/xghc
 ADD ./xghc-8.x /opt/ghc/8.2.2/bin/xghc
 ADD ./xghc-8.x /opt/ghc/8.4.4/bin/xghc
 ADD ./xghc-8.x /opt/ghc/8.6.5/bin/xghc
-ADD ./xghc-8.x /opt/ghc/8.8.1/bin/xghc
+ADD ./xghc-8.x /opt/ghc/8.8.3/bin/xghc
+ADD ./xghc-8.x /opt/ghc/8.10.1/bin/xghc
 RUN sed -i 's|"$PKGCONF" ${1+"$@"}|"$PKGCONF" +RTS -M1G -RTS ${1+"$@"}|g' /opt/ghc/*/bin/ghc-pkg-[78]*.*
 
 # user setup