Commit d92a1c14 authored by Steffen Müthing's avatar Steffen Müthing

[!17] Add more PDELab images for better testing

I had to remove dune-alugrid from the clang-based images because clang
just hangs indefinitely when trying to build that module right now.

See merge request !17
parents 3e7e0923 5ca5d4a3
......@@ -288,19 +288,63 @@ dune:2.6-ubuntu-18.04-clang-6-17:
# ---------------------------------------------------------------------
dune-pdelab-deps:2.6:
dune-pdelab-deps:2.6-debian-9-gcc-6-14:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune:2.6-debian-9-gcc-6-14"
dune-pdelab-deps:git:
dune-pdelab-deps:2.6-debian-10-gcc-7-noassert-14:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune:2.6-debian-10-gcc-7-noassert-14"
dune-pdelab-deps:2.6-debian-10-gcc-8-17:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune:2.6-debian-10-gcc-8-17"
EXTRA_TAG: "2.6"
dune-pdelab-deps:2.6-debian-10-clang-6-libcpp-17:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune:2.6-debian-10-clang-6-libcpp-17"
dune-pdelab-deps:git-debian-10-gcc-7-14:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: git
BASE_IMAGE: "dune:git-debian-10-gcc-7-14"
EXTRA_TAG: "git"
dune-pdelab-deps:git-debian-10-gcc-8-noassert-17:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: git
BASE_IMAGE: "dune:git-debian-10-gcc-8-noassert-17"
dune-pdelab-deps:git-debian-10-clang-6-libcpp-17:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "git"
BASE_IMAGE: "dune:git-debian-10-clang-6-libcpp-17"
# ---------------------------------------------------------------------
......@@ -324,21 +368,64 @@ dune-fufem:git:
MODULE: fufem
VERSION: "git"
dune-pdelab:2.6:
dune-pdelab:2.6-debian-9-gcc-6-14:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune-pdelab-deps:2.6"
BASE_IMAGE: "dune-pdelab-deps:2.6-debian-9-gcc-6-14"
dune-pdelab:2.6-debian-10-gcc-7-noassert-14:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune-pdelab-deps:2.6-debian-10-gcc-7-noassert-14"
dune-pdelab:2.6-debian-10-gcc-8-17:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune-pdelab-deps:2.6-debian-10-gcc-8-17"
EXTRA_TAG: "2.6"
dune-pdelab:2.6-debian-10-clang-6-libccp-17:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune-pdelab-deps:2.6-debian-10-clang-6-libcpp-17"
dune-pdelab:git-debian-10-gcc-7-14:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: git
BASE_IMAGE: "dune-pdelab-deps:git-debian-10-gcc-7-14"
EXTRA_TAG: "git"
dune-pdelab:git-debian-10-gcc-8-noassert-17:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: git
BASE_IMAGE: "dune-pdelab-deps:git-debian-10-gcc-8-noassert-17"
dune-pdelab:git:
dune-pdelab:git-debian-10-clang-6-libccp-17:
<<: *module-image
variables:
<<: *module-variables
MODULE: pdelab
VERSION: "git"
BASE_IMAGE: "dune-pdelab-deps:git"
BASE_IMAGE: "dune-pdelab-deps:git-debian-10-clang-6-libcpp-17"
# ---------------------------------------------------------------------
......
FROM registry.dune-project.org/docker/ci/dune:2.6
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG BASE_IMAGE
ARG DUNECI_PARALLEL
USER duneci
RUN duneci-install-module -b releases/2.6 https://gitlab.dune-project.org/extensions/dune-alugrid.git
RUN /bin/bash -c "if [[ ! ${BASE_IMAGE} =~ :.*clang-6 ]] ; then duneci-install-module -b releases/2.6 https://gitlab.dune-project.org/extensions/dune-alugrid.git ; fi"
FROM registry.dune-project.org/docker/ci/dune:git
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG BASE_IMAGE
ARG DUNECI_PARALLEL
USER duneci
RUN duneci-install-module https://gitlab.dune-project.org/extensions/dune-alugrid.git
RUN /bin/bash -c "if [[ ! ${BASE_IMAGE} =~ :.*clang-6 ]] ; then duneci-install-module -b master https://gitlab.dune-project.org/extensions/dune-alugrid.git ; fi"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment