diff options
| author | Evelina Ametova <evelina@ipecompute4.ands.kit.edu> | 2022-02-01 12:14:51 +0100 |
|---|---|---|
| committer | Evelina Ametova <evelina@ipecompute4.ands.kit.edu> | 2022-02-01 12:14:51 +0100 |
| commit | a3f93ec6436d64f515546ceefe394a79e0552b13 (patch) | |
| tree | 7010c8c7b09d07e3cfc6c5995d7b81cac0af64a1 /build | |
| parent | 4db96282d126e10c691474264fcdbeca2398555e (diff) | |
| download | ccpi-a3f93ec6436d64f515546ceefe394a79e0552b13.tar.gz ccpi-a3f93ec6436d64f515546ceefe394a79e0552b13.tar.bz2 ccpi-a3f93ec6436d64f515546ceefe394a79e0552b13.tar.xz ccpi-a3f93ec6436d64f515546ceefe394a79e0552b13.zip | |
Update to new ubuntu and ccpi
Diffstat (limited to 'build')
| -rw-r--r-- | build/buildah-base.sh | 8 | ||||
| -rw-r--r-- | build/buildah-ccpi.sh | 2 | ||||
| -rw-r--r-- | build/pre-setup/requirements.txt | 2 | ||||
| -rw-r--r-- | build/setup/repos.sh | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/build/buildah-base.sh b/build/buildah-base.sh index b656515..319ed6b 100644 --- a/build/buildah-base.sh +++ b/build/buildah-base.sh @@ -2,7 +2,8 @@ set -o errexit -container=$(buildah from nvidia/cuda:10.1-devel-ubuntu18.04) +#container=$(buildah from nvidia/cuda:10.1-devel-ubuntu18.04) +container=$(buildah from nvidia/cuda:11.3.0-devel-ubuntu20.04) buildah config --label maintainer="Suren A. Chilingaryan <csa@suren.me>" $container buildah config --env LANG="C.UTF-8" --env LC_ALL="C.UTF-8" --env TERM="xterm" $container @@ -20,12 +21,15 @@ buildah run $container sh -c 'echo "systemd-network:x:105:" >> /etc/group' buildah run $container sh -c 'echo "systemd-network:x:105:105:systemd-network:/dev/null:/sbin/nologin" >> /etc/passwd' buildah run $container sh -c 'echo "systemd-resolve:x:106:" >> /etc/group' buildah run $container sh -c 'echo "systemd-resolve:x:106:106:systemd-resolve:/dev/null:/sbin/nologin" >> /etc/passwd' +buildah run $container sh -c 'echo "systemd-timesync:x:107:" >> /etc/group' +buildah run $container sh -c 'echo "systemd-timesync:x:107:107:systemd-timesync:/dev/null:/sbin/nologin" >> /etc/passwd' + buildah run $container sh -c 'apt-get update --fix-missing && apt-get install -y bash wget bzip2 mc ca-certificates git openssh-server' buildah run $container sh -c 'apt-get install -y python3 python3-setuptools python3-pip cython3' buildah run $container sh -c 'apt-get install -y cmake make autoconf automake libtool gcc g++ libboost-all-dev' buildah run $container sh -c 'apt-get install -y ca-certificates pkg-config gobject-introspection liblapack-dev libjpeg-dev libtiff-dev libglib2.0-dev libjson-glib-dev libopenmpi-dev libhdf5-dev libclfft-dev libgsl-dev libgirepository1.0-dev fftw3-dev zlib1g-dev' -buildah run $container sh -c 'apt-get install -y python3-dev python3-numpy python-gobject python-tifffile' +buildah run $container sh -c 'apt-get install -y python3-dev python3-numpy python-gobject tifffile' buildah run $container sh -c 'apt-get install -y ocl-icd-opencl-dev clinfo' buildah run $container sh -c 'apt-get install -y jupyter-notebook' diff --git a/build/buildah-ccpi.sh b/build/buildah-ccpi.sh index 3d006fc..661e0ef 100644 --- a/build/buildah-ccpi.sh +++ b/build/buildah-ccpi.sh @@ -4,7 +4,7 @@ set -o errexit container=$(buildah from astra:latest) -buildah config --env LANG="C.UTF-8" --env LC_ALL="C.UTF-8" --env TERM="xterm" --env CIL_VERSION=19.10 --env HOME=/ccpi/data --env LD_LIBRARY_PATH="/ccpi/repos/CCPi-Regularisation-Toolkit/src/Core:/ccpi/repos/CCPi-Framework/src/Core" $container +buildah config --env LANG="C.UTF-8" --env LC_ALL="C.UTF-8" --env TERM="xterm" --env CIL_VERSION=21.0.0 --env HOME=/ccpi/data --env LD_LIBRARY_PATH="/ccpi/repos/CCPi-Regularisation-Toolkit/src/Core:/ccpi/repos/CCPi-Framework/src/Core" $container buildah run $container bash /root/setup/repos.sh "ccpi" buildah commit --format docker $container ccpi:latest diff --git a/build/pre-setup/requirements.txt b/build/pre-setup/requirements.txt index e7b8d3b..5bd0c06 100644 --- a/build/pre-setup/requirements.txt +++ b/build/pre-setup/requirements.txt @@ -5,3 +5,5 @@ matplotlib h5py pillow pycuda +scikit-image +scikit-learn diff --git a/build/setup/repos.sh b/build/setup/repos.sh index 0c7481a..208ba3e 100644 --- a/build/setup/repos.sh +++ b/build/setup/repos.sh @@ -35,12 +35,13 @@ function install_repo { branch="$2" script="$3" - [ -d "$name" ] || git clone "$repo" + [ -d "$name" ] || git clone --recurse-submodules "$repo" ( cd "$name" git pull origin "$branch" git checkout "$branch" + git submodule update --recursive --remote bash "$setup_path/build/$script" ln -sf "$setup_path/build/$script" ands_install.sh ) |