Skip to content

Commit

Permalink
Add ubuntu container as CVMFS runner requires some ubuntu specific in…
Browse files Browse the repository at this point in the history
…stalls
  • Loading branch information
Henry Wallace committed Jan 27, 2025
1 parent 945056c commit 431eec1
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/CIBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
- os: Alma9
file: doc/MaCh3DockerFiles/Alma9/Dockerfile
tag: alma9latest
- os: Ubuntu22.04
file: doc/MaCh3DockerFiles/Ubuntu22/Dockerfile
tag: ubuntulatest

# - os: Rocky9
# file: doc/MaCh3DockerFiles/Rocky9/Dockerfile
# tag: rocky9latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/EventRates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

name: Build CI ${{ matrix.os }}
container:
image: ghcr.io/dune/mach3:alma9latest
image: ghcr.io/dune/mach3:ubuntulatest
options: --privileged -v /cvmfs:/cvmfs:shared

steps:
Expand Down
30 changes: 30 additions & 0 deletions doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#To run use: docker build --secret id=tokens,src=tokens.txt -t mach3dune .
FROM rootproject/root:6.32.02-ubuntu22.04 AS mach3_dune_build

RUN apt update && apt upgrade -y
RUN apt-get install -y nlohmann-json3-dev
#MISC_SW
RUN apt install -y --no-install-recommends \
vim less nano gdb csh tcsh ed quota python3 python3-dev python3-pip \
cvs procmail ca-certificates cmake ninja-build


# Declare the build argument
ARG MACH3_DUNE_VERSION
ENV MACH3_DUNE_VERSION=${MACH3_DUNE_VERSION:-develop}

ENV MACH3_DUNE_WORK_DIR=/opt/MaCh3DUNE/
ENV MACH3_DUNE_INSTALL_DIR=${MACH3_DUNE_WORK_DIR}/build


RUN --mount=type=ssh git clone https://github.com/DUNE/MaCh3_DUNE.git ${MACH3_DUNE_WORK_DIR}

WORKDIR ${MACH3_DUNE_WORK_DIR}
RUN git checkout ${MACH3_DUNE_VERSION}

RUN mkdir -p ${MACH3_DUNE_INSTALL_DIR}
WORKDIR ${MACH3_DUNE_INSTALL_DIR}

RUN cmake ../

RUN make -j && make install

0 comments on commit 431eec1

Please sign in to comment.