Skip to content
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

Jump to bottom

Add alma9 flavour (attempt to add standalone Combine after) #25

Merged
merged 5 commits into from
Jun 13, 2024
Merged

Add alma9 flavour (attempt to add standalone Combine after) #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f4df0e
Add alma9 flavour (attempt to add standalone Combine after)
oshadura Jun 13, 2024
93860e8
remove curl and sync deps with base image
oshadura Jun 13, 2024
fa0140e
We need curl for mamba
oshadura Jun 13, 2024
2b4ace8
Curl installation is broken on alma9
oshadura Jun 13, 2024
fc4fa24
Update mamba installation version to latest
oshadura Jun 13, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/gh-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ jobs:
fail-fast: false
matrix:
image_dir: [coffea-base, coffea-dask]
distro: [almalinux8]
distro: [almalinux8, almalinux9]
python: ["3.9", "3.10", "3.11"]
exclude:
- distro: almalinux8
python: 3.9
- distro: almalinux9
python: 3.9
- image_dir: coffea-base
python: 3.11
name: ${{ matrix.image_dir }}-${{ matrix.distro }}-${{ matrix.python }}
Expand Down
2 changes: 1 addition & 1 deletion coffea-base/Dockerfile.almalinux8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV PYTHON_VERSION=${python}

RUN yum -y install epel-release \
&& yum -y update \
&& yum -y install git curl bzip2 libgfortran which \
&& yum -y install curl git bzip2 libgfortran which zsh emacs vim htop man man-pages \
&& curl -sSL https://github.com/conda-forge/miniforge/releases/download/23.3.1-1/Mambaforge-Linux-x86_64.sh -o /tmp/mambaforge.sh \
&& bash /tmp/mambaforge.sh -bfp /usr/local \
&& rm -rf /tmp/mambaforge.sh \
Expand Down
28 changes: 28 additions & 0 deletions coffea-base/Dockerfile.almalinux9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM almalinux:9

ARG python
ARG releasev0

ENV PYTHON_VERSION=${python}

RUN yum -y install epel-release \
&& yum -y update \
&& yum -y --allowerasing install wget git bzip2 libgfortran which zsh emacs vim htop man man-pages \
&& wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
&& bash Miniforge3.sh -bfp /usr/local \
&& rm -rf /tmp/mambaforge.sh \
&& mamba update mamba \
&& mamba clean --all --yes \
&& yum clean all

COPY environment.yaml /

RUN mamba install --yes python=${PYTHON_VERSION} \
&& mamba env update --file /environment.yaml \
&& mamba clean -y --all

# Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security
RUN ln -s /usr/local/etc/grid-security /etc/grid-security && \
curl -L https://github.com/opensciencegrid/osg-vo-config/archive/refs/heads/master.tar.gz | \
tar -xz --strip-components=1 --directory=/etc/grid-security --wildcards */vomses */vomsdir && \
mv /etc/grid-security/vomses /etc
28 changes: 28 additions & 0 deletions coffea-dask/Dockerfile.almalinux9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM almalinux:9

ARG python
ARG release

ENV PYTHON_VERSION=${python}

RUN yum -y install epel-release \
&& yum -y update \
&& yum -y --allowerasing install wget git bzip2 libgfortran which zsh emacs vim htop man man-pages \
&& wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
&& bash Miniforge3.sh -bfp /usr/local \
&& rm -rf /tmp/mambaforge.sh \
&& mamba update mamba \
&& mamba clean --all --yes \
&& yum clean all

COPY environment.yaml /

RUN mamba install --yes python=${PYTHON_VERSION} \
&& mamba env update --file /environment.yaml \
&& mamba clean -y --all

# Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security
RUN ln -s /usr/local/etc/grid-security /etc/grid-security && \
curl -L https://github.com/opensciencegrid/osg-vo-config/archive/refs/heads/master.tar.gz | \
tar -xz --strip-components=1 --directory=/etc/grid-security --wildcards */vomses */vomsdir && \
mv /etc/grid-security/vomses /etc
Loading