Skip to content

Commit

Permalink
[docker] use ubuntu jammy 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiskelm committed Mar 12, 2024
1 parent d4cb258 commit 3d5bf7f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-docker-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
tags: ${{ env.dockerhub_username }}/dumux-precice:${{ matrix.dumux_version }}-${{ matrix.precice_version }}
build-args: |
DUNEVERSION=2.9
PRECICEUBUNTU=focal
PRECICEUBUNTU=jammy
DUMUXVERSION=${{ matrix.dumux_version }}
PRECICEVERSION=${{ matrix.precice_version }}
build-dune-precice:
Expand Down Expand Up @@ -69,5 +69,5 @@ jobs:
tags: ${{ env.dockerhub_username }}/dune-precice:${{ matrix.dune_version }}-${{ matrix.precice_version }}
build-args: |
DUNEVERSION=${{ matrix.dune_version }}
PRECICEUBUNTU=focal
PRECICEUBUNTU=jammy
PRECICEVERSION=${{ matrix.precice_version }}
2 changes: 1 addition & 1 deletion docker/dockerfile.large
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ENV PYTHONPATH ${USER_HOME}/dumux/bin/testing:${PYTHONPATH}

#Install preCICE
ARG PRECICEVERSION=3.0.0
ARG PRECICEUBUNTU=focal
ARG PRECICEUBUNTU=jammy
RUN wget https://github.com/precice/precice/releases/download/v${PRECICEVERSION}/libprecice3_${PRECICEVERSION}_${PRECICEUBUNTU}.deb -O libprecice${PRECICEVERSION}-${PRECICEUBUNTU}.deb \
&& apt install -y ./libprecice${PRECICEVERSION}-${PRECICEUBUNTU}.deb \
&& rm -f ./libprecice${PRECICEVERSION}-${PRECICEUBUNTU}.deb
Expand Down
2 changes: 1 addition & 1 deletion docker/dockerfile.slim
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ENV PYTHONPATH ${DUMUXINSTALLPATH}/dumux/bin/testing:${PYTHONPATH}

# Compile minmum version of preCICE
ARG PRECICEVERSION=v3.0.0
ARG PRECICEUBUNTU=focal
ARG PRECICEUBUNTU=jammy
RUN git clone --depth 1 -b ${PRECICEVERSION} https://github.com/precice/precice.git precice-${PRECICEVERSION} && cd precice-${PRECICEVERSION} && mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPRECICE_FEATURE_MPI_COMMUNICATION=OFF -DPRECICE_FEATURE_PETSC_MAPPING=OFF -DPRECICE_FEATURE_PYTHON_ACTIONS=OFF -DCMAKE_INSTALL_PREFIX=/usr && make -j 4 && make test && make install && cd ../../ && rm -rf precice-${PRECICEVERSION}

RUN apt-get purge -y libboost-log-dev libboost-thread-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-test-dev libboost-container-dev libxml2-dev
Expand Down
2 changes: 1 addition & 1 deletion docker/dockerfile_dune-precice.slim
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ENV DUNE_CONTROL_PATH=${DUMUXINSTALLPATH}/dune-common/dune.module:${DUMUXINSTALL

# Compile minmum version of preCICE
ARG PRECICEVERSION=v3.0.0
ARG PRECICEUBUNTU=focal
ARG PRECICEUBUNTU=jammy
RUN git clone --depth 1 -b ${PRECICEVERSION} https://github.com/precice/precice.git precice-${PRECICEVERSION} && cd precice-${PRECICEVERSION} && mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPRECICE_FEATURE_MPI_COMMUNICATION=OFF -DPRECICE_FEATURE_PETSC_MAPPING=OFF -DPRECICE_FEATURE_PYTHON_ACTIONS=OFF -DCMAKE_INSTALL_PREFIX=/usr && make -j 4 && make test && make install && cd ../../ && rm -rf precice-${PRECICEVERSION}

RUN apt-get purge -y libboost-log-dev libboost-thread-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-test-dev libboost-container-dev libxml2-dev
Expand Down

0 comments on commit 3d5bf7f

Please sign in to comment.