diff --git a/.github/workflows/CIBuild.yml b/.github/workflows/CIBuild.yml index 69c9197..087026a 100644 --- a/.github/workflows/CIBuild.yml +++ b/.github/workflows/CIBuild.yml @@ -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 diff --git a/.github/workflows/EventRates.yml b/.github/workflows/EventRates.yml index 4fe73fe..28b8e22 100644 --- a/.github/workflows/EventRates.yml +++ b/.github/workflows/EventRates.yml @@ -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: diff --git a/doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile b/doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile new file mode 100644 index 0000000..5f5e42b --- /dev/null +++ b/doc/MaCh3DockerFiles/Ubuntu22.04/Dockerfile @@ -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 \ No newline at end of file