diff --git a/docker/Dockerfile b/docker/Dockerfile index f0b4423..271fdaa 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:centos7 as base +FROM gitlab-registry.cern.ch/linuxsupport/alma9-base:20230601-2 as base # FROM coffeateam/coffea-dask:0.7.19-fastjet-3.3.4.0rc9-ge92ece7 as base SHELL [ "/bin/bash", "-c" ] @@ -39,6 +39,7 @@ RUN yum install -y \ micromamba env list && \ micromamba install \ --channel conda-forge \ + --freeze-installed \ --yes \ cmake \ gcc \ @@ -83,29 +84,25 @@ RUN yum install -y \ # torch-cluster \ # torch-spline-conv -ARG HTCONDOR_VERSION=9.0 -# install condor v9 -# /etc/condor and /direct/condor are necessary bind mounts for BNL -RUN mkdir -p -v /etc/condor && \ - mkdir -p -v /direct/condor && \ - yum install -y https://research.cs.wisc.edu/htcondor/repo/9.0/htcondor-release-current.el7.noarch.rpm && \ - yum install -y https://research.cs.wisc.edu/htcondor/repo/9.0/el7/x86_64/release/condor-9.0.17-1.el7.x86_64.rpm && \ - yum clean all && \ - yum autoremove -y - # /etc/condor and /direct/condor are necessary bind mounts for BNL # * Make a symbolic link between installation <...>/etc/grid-security and actual directory /etc/grid-security +# * SDCC host Python ABI compatability: +# - libcrypt.so.1 symlink pointing to libcrypt.so.2 +# - libcrypto.so.10 symlink pointing to libcrypto.so.3 +# - libssl.so.10 symlink pointing to libssl.so.3 # * Make "analysis-systems" kernel discoverable to BNL SDCC which has kenerls at /u0b/software/jupyter/kernels/ # * Ensure default directories and that they are writeable by arbitrary user # * Set defaults for jupyter lab # * Set JUPYTER_PATH and JUPYTER_DATA_DIR # * Add build date file to easily check if analysis facilities have synced images # * Add bind mount to Lustre space at BNL SDCC -# * Symlink condor binaries under /usr/bin/ to ensure available globally RUN mkdir -p -v /etc/condor && \ mkdir -p -v /direct/condor && \ mkdir -p -v /usatlas/atlas01 && \ ln --symbolic /opt/micromamba/envs/analysis-systems/etc/grid-security /etc/grid-security && \ + ln --symbolic /lib64/libcrypt.so.2 /lib64/libcrypt.so.1 && \ + ln --symbolic /lib64/libcrypto.so.3 /lib64/libcrypto.so.10 && \ + ln --symbolic /lib64/libssl.so.3 /lib64/libssl.so.10 && \ mkdir -p -v /u0b/software/jupyter/kernels && \ ln --symbolic /opt/micromamba/envs/analysis-systems/share/jupyter/kernels/analysis-systems /u0b/software/jupyter/kernels/analysis-systems && \ mkdir -p -v \ diff --git a/noxfile.py b/noxfile.py index 4a07e49..e29cc0e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -81,10 +81,16 @@ def build(session): Build image """ current_date = datetime.now().strftime("%Y-%m-%d") - session.run("docker", "pull", "centos:centos7", external=True) + session.run( + "docker", + "pull", + "gitlab-registry.cern.ch/linuxsupport/alma9-base:20230601-2", + external=True, + ) session.run( "docker", "build", + "--progress=plain", "--file", "docker/Dockerfile", "--tag",