address comments

geodynamics · Jun 10, 2024 · 61911d3 · 61911d3
1 parent 83d064f
commit 61911d3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -42,7 +42,7 @@ jobs:
       run: |
         mkdir build
         cd build
-	../contrib/utilities/run_clang_tidy.sh
+        ../contrib/utilities/run_clang_tidy.sh
 	mv output.txt ${{ matrix.result-file }}
     - name: compile
       run: |

diff --git a/contrib/docker/tester-clang/Dockerfile b/contrib/docker/tester-clang/Dockerfile
@@ -32,14 +32,4 @@ ENV OMPI_MCA_rmaps_base_oversubscribe=1
 ENV OMPI_ALLOW_RUN_AS_ROOT=1
 ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
-# Set environment variables for derived images, which
-# are build by Jenkins
-ONBUILD ENV PATH="/opt/astyle-2.04:$PATH"
-ONBUILD ENV DEAL_II_DIR /opt/deal.II-master
-ONBUILD ENV OMPI_MCA_btl_base_warn_component_unused=0
-ONBUILD ENV OMPI_MCA_mpi_yield_when_idle=1
-ONBUILD ENV OMPI_MCA_rmaps_base_oversubscribe=1
-ONBUILD ENV OMPI_ALLOW_RUN_AS_ROOT=1
-ONBUILD ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
-
 WORKDIR /opt
diff --git a/contrib/docker/tester-clang/build.sh b/contrib/docker/tester-clang/build.sh
@@ -2,4 +2,4 @@
 
 # This script generates a docker image for the ASPECT tester.
 
-docker build -t geodynamics/aspect-tester:jammy-dealii-master-clang .
+docker build -t geodynamics/aspect-tester:noble-dealii-master-clang .
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		# This script generates a docker image for the ASPECT tester.

		docker build -t geodynamics/aspect-tester:jammy-dealii-master-clang .
		docker build -t geodynamics/aspect-tester:noble-dealii-master-clang .