update docker image to Ubuntu/pid1 22.04 LTS

- drop embedding ghc and stack
- use libz3-dev
This commit is contained in:
Jens Petersen 2022-12-30 23:00:21 +08:00
parent f72a12f7d0
commit ea2fead291
4 changed files with 7 additions and 16 deletions

View File

@ -1,8 +1,8 @@
FROM fpco/pid1:20.04 FROM fpco/pid1:22.04
ENV HOME /home/stackage ENV HOME /home/stackage
ENV LANG en_US.UTF-8 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 # 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 # ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin

View File

@ -23,5 +23,5 @@ unzip awscliv2.zip
rm -rf /tmp/awscli rm -rf /tmp/awscli
# Get Stack and GHC # Get Stack and GHC
curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin #curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
stack setup --resolver ghc-$GHCVER #stack setup --resolver ghc-$GHCVER

View File

@ -119,6 +119,7 @@ apt-get install -y \
libxrandr-dev \ libxrandr-dev \
libxss-dev \ libxss-dev \
libyaml-dev \ libyaml-dev \
libz3-dev \
libzip-dev \ libzip-dev \
libzmq3-dev \ libzmq3-dev \
libzstd-dev \ libzstd-dev \

View File

@ -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/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 #echo /usr/lib/llvm-3.7/lib > /etc/ld.so.conf.d/llvm.conf
# ldconfig
ldconfig
# Install librdkafka (Apache Kafka C/C++ library) # Install librdkafka (Apache Kafka C/C++ library)
wget -qO - https://packages.confluent.io/deb/5.2/archive.key | apt-key add - 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" add-apt-repository "deb https://packages.confluent.io/deb/5.2 stable main"
apt-get update && apt install -y librdkafka-dev 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 LIBJWT_VER=1.12.1
( (
pushd /tmp \ pushd /tmp \