Skip to content
Snippets Groups Projects
Commit f0d59f6f authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'ci-fix-container' into 'master'

[ci] Use 23.04 for Jupyter base image too.

See merge request ogs/ogs!4895
parents a044aee7 b8481acd
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ container: ...@@ -72,7 +72,7 @@ container:
poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../.. poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../..
--build_args ' --progress=plain' --cvode --ccache --cpmcache --mfront --cpu-target $CPU_TARGET --build_args ' --progress=plain' --cvode --ccache --cpmcache --mfront --cpu-target $CPU_TARGET
--cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF' --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
--runtime_base_image 'registry.opengeosys.org/ogs/ogs/jupyter/base-notebook-ubuntu:22.04_3.10' --runtime_base_image 'registry.opengeosys.org/ogs/ogs/jupyter/base-notebook-ubuntu:23.04_3.10'
--boost-sourceforge --boost-sourceforge
--tag $DOCKER_TAG_JUPYTER --tag $DOCKER_TAG_JUPYTER
$ON_MASTER_ARGS $ON_MASTER_ARGS
...@@ -81,7 +81,7 @@ container: ...@@ -81,7 +81,7 @@ container:
poetry run ogscm compiler.py mpi.py ogs.py ogs_jupyter.py -B -R --ogs ../.. poetry run ogscm compiler.py mpi.py ogs.py ogs_jupyter.py -B -R --ogs ../..
--build_args ' --progress=plain' --cvode --ccache --cpmcache --mfront --cpu-target $CPU_TARGET --build_args ' --progress=plain' --cvode --ccache --cpmcache --mfront --cpu-target $CPU_TARGET
--cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF' --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
--runtime_base_image 'registry.opengeosys.org/ogs/ogs/jupyter/base-notebook-ubuntu:22.04_3.10' --runtime_base_image 'registry.opengeosys.org/ogs/ogs/jupyter/base-notebook-ubuntu:23.04_3.10'
--mpi_no_entrypoint --mpi_no_entrypoint
--boost-sourceforge --boost-sourceforge
--tag $DOCKER_TAG_JUPYTER_PETSC --tag $DOCKER_TAG_JUPYTER_PETSC
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment