From ea2fead2914c5eeedc271b795c5d1e0f6c5c3b86 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Fri, 30 Dec 2022 23:00:21 +0800
Subject: [PATCH] update docker image to Ubuntu/pid1 22.04 LTS

- drop embedding ghc and stack
- use libz3-dev
---
 Dockerfile                   |  4 ++--
 docker/01-build-server.sh    |  4 ++--
 docker/02-apt-get-install.sh |  1 +
 docker/03-custom-install.sh  | 14 ++------------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 076892af..3f3cc4d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM fpco/pid1:20.04
+FROM fpco/pid1:22.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
-ENV GHCVER 9.4.3
+# ENV GHCVER 9.4.3
 
 # NOTE: also update docker/03-custom-install.sh when cuda version changes
 # ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/docker/01-build-server.sh b/docker/01-build-server.sh
index 98f6267a..62484a7c 100755
--- a/docker/01-build-server.sh
+++ b/docker/01-build-server.sh
@@ -23,5 +23,5 @@ unzip awscliv2.zip
 rm -rf /tmp/awscli
 
 # Get Stack and GHC
-curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
-stack setup --resolver ghc-$GHCVER
+#curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
+#stack setup --resolver ghc-$GHCVER
diff --git a/docker/02-apt-get-install.sh b/docker/02-apt-get-install.sh
index aedcb8e5..eb2602d5 100755
--- a/docker/02-apt-get-install.sh
+++ b/docker/02-apt-get-install.sh
@@ -119,6 +119,7 @@ apt-get install -y \
     libxrandr-dev \
     libxss-dev \
     libyaml-dev \
+    libz3-dev \
     libzip-dev \
     libzmq3-dev \
     libzstd-dev \
diff --git a/docker/03-custom-install.sh b/docker/03-custom-install.sh
index 38071975..a891bed7 100755
--- a/docker/03-custom-install.sh
+++ b/docker/03-custom-install.sh
@@ -132,24 +132,14 @@ rm -f $PROTOC_ZIP
 
 echo /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server > /etc/ld.so.conf.d/java.conf
 
-echo /usr/lib/llvm-3.7/lib > /etc/ld.so.conf.d/llvm.conf
-
-ldconfig
+#echo /usr/lib/llvm-3.7/lib > /etc/ld.so.conf.d/llvm.conf
+# ldconfig
 
 # Install librdkafka (Apache Kafka C/C++ library)
 wget -qO - https://packages.confluent.io/deb/5.2/archive.key | apt-key add -
 add-apt-repository "deb https://packages.confluent.io/deb/5.2 stable main"
 apt-get update && apt install -y librdkafka-dev
 
-Z3_VER=4.8.8
-(
-  cd /usr/local/ \
-    && wget https://github.com/Z3Prover/z3/releases/download/z3-${Z3_VER}/z3-${Z3_VER}-x64-ubuntu-16.04.zip \
-    && unzip z3-${Z3_VER}-x64-ubuntu-16.04.zip \
-    && rm z3-${Z3_VER}-x64-ubuntu-16.04.zip \
-    && ln -s /usr/local/z3-${Z3_VER}-x64-ubuntu-16.04/bin/z3 /usr/bin/z3
-)
-
 LIBJWT_VER=1.12.1
 (
 pushd /tmp \