Docker: remove various stale commented-out lines

This commit is contained in:
Jens Petersen 2023-06-12 19:13:56 +02:00
parent 21be32c8f8
commit ee4e2d243d
3 changed files with 0 additions and 74 deletions

View File

@ -2,11 +2,6 @@ FROM fpco/pid1:22.04
ENV HOME /home/stackage
ENV LANG en_US.UTF-8
# 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
# ENV CUDA_PATH /usr/local/cuda-10.0
ADD docker/01-build-server.sh /tmp/01-build-server.sh
RUN /tmp/01-build-server.sh && rm /tmp/01-build-server.sh

View File

@ -21,7 +21,3 @@ unzip -q awscliv2.zip
./aws/install --bin-dir /usr/bin
)
rm -rf /tmp/awscli
# Get Stack and GHC
#curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
#stack setup --resolver ghc-$GHCVER

View File

@ -8,22 +8,6 @@ export DEBIAN_FRONTEND=noninteractive
# Add system dependencies not present in the ubuntu package registry here.
# Please add a comment stating which haskell packages needs it.
# odbc
# TODO: See if we can fix this...
# E: Failed to fetch https://packages.microsoft.com/debian/9/prod/pool/main/u/unixodbc/odbcinst_2.3.7_amd64.deb 404 Not Found
#
# curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
# curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list
# apt-get update
# ACCEPT_EULA=Y apt-get install msodbcsql17 -y
# llvm for llvm-hs
#curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
#add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main"
#apt-get update
#apt-get install llvm-9-dev -y
locale-gen en_US.UTF-8
# Buggy versions of ld.bfd fail to link some Haskell packages:
@ -32,18 +16,6 @@ locale-gen en_US.UTF-8
update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
# GHC requires a specific LLVM version on the system PATH for its LLVM backend.
# This version is tracked here:
# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
#
# GHC 8.10 requires LLVM 9 tools (?) (specifically, llc-9 and opt-9).
#update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-9" 50
#update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-9" 50
# nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev)
#curl -sL https://deb.nodesource.com/setup_10.x | bash -
#apt-get install -y nodejs
# install ocilib dependencies then build and install ocilib
cd /tmp \
&& wget https://storage.googleapis.com/oracle.fpinsight.com/instantClient/oracle-instantclient12.1-basiclite_12.1.0.2.0-2_amd64.deb \
@ -85,40 +57,6 @@ curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-l
&& rm libtensorflow.tar.gz \
&& ldconfig
# NOTE: This cuda pubkey is no longer available.
#
# NOTE: also update Dockerfile when cuda version changes
#
# Install CUDA toolkit
# The current version can be found at: https://developer.nvidia.com/cuda-downloads
#
# CUDA_PKG=10.0.130-1
# CUDA_VER=10.0
# CUDA_APT=10-0
#
#pushd /tmp \
# && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \
# && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub \
# && dpkg -i cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \
# && apt-get update -qq \
# && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \
# && rm cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \
# && export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \
# && export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH+x} \
# && export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \
# && export PATH=${CUDA_PATH}/bin:${PATH} \
# && popd
#
# non-free repo for mediabus-fdk-aac
#apt-add-repository multiverse \
# && apt-get update \
# && apt-get install -y nvidia-cuda-dev
#
# Update library search paths
#echo /usr/local/cuda-10.0/lib64 > /etc/ld.so.conf.d/cuda.conf
#echo /usr/local/cuda-10.0/nvvm/lib64 >> /etc/ld.so.conf.d/cuda.conf
export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-9/lib;
export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-9/include;
@ -132,9 +70,6 @@ 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
# 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"