Skip to content

feat: Update to AlmaLinux 9 for base OS #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
matthewfeickert wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

feat: Update to AlmaLinux 9 for base OS #30

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
08d1e0d
feat: Update to AlmaLinux 9 for base OS
matthewfeickert Jun 2, 2023
fa9364c
Debug
matthewfeickert Jun 2, 2023
cf211bb
Comment out all HTCondor stuff
matthewfeickert Jun 3, 2023
63b6a2d
Keep packages from being updated
matthewfeickert Jun 3, 2023
4ceb6af
Remove HTCondor manual install stuff
matthewfeickert Jun 3, 2023
89f267e
Use progress plain to get log file
matthewfeickert Jun 5, 2023
0619c62
Make a symlink for libcryp.so.1
matthewfeickert Jun 5, 2023
8b265c3
Make a symlink for libssl.so.10
matthewfeickert Jun 5, 2023
76ea4e1
Make a symlink for libcrypto.so.10
matthewfeickert Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down Expand Up @@ -39,6 +39,7 @@ RUN yum install -y \
micromamba env list && \
micromamba install \
--channel conda-forge \
--freeze-installed \
Copy link
Member Author

@matthewfeickert matthewfeickert Jun 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migrate this htcondor related stuff to another PR.

--yes \
cmake \
gcc \
Expand Down Expand Up @@ -83,16 +84,6 @@ 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
# * Make "analysis-systems" kernel discoverable to BNL SDCC which has kenerls at /u0b/software/jupyter/kernels/
Expand All @@ -101,7 +92,6 @@ RUN mkdir -p -v /etc/condor && \
# * 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 && \
Expand Down
7 changes: 6 additions & 1 deletion noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ 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",
Expand Down