Skip to content

Commit e8b88b1

Browse files
committed
fix: minor bugs with foam-extend containers
1 parent c1e1241 commit e8b88b1

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

basic/foam-extend.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ From: containers/basic/{{ OS_DISTRO }}-{{ OS_VERSION }}-{{ MPI_IMPLEMENTATION }}
3535
nProcs=$(nproc)
3636
/bin/bash -c "cd /opt/foam/foam-extend-{{ FRAMEWORK_VERSION }} && source etc/bashrc && ./Allwmake.firstInstall -j $nProcs"
3737
rm -rf /opt/foam/foam-extend-{{ FRAMEWORK_VERSION }}/tutorials/*
38-
FRAMEWORK_COMMIT_HASH=$(git -C /opt/foam/foam-extend-{{ OF_VERSION }} rev-parse HEAD)
38+
FRAMEWORK_COMMIT_HASH=$(git -C /opt/foam/foam-extend-{{ FRAMEWORK_VERSION }} rev-parse HEAD)
3939
jq --arg app openfoam --arg commit $FRAMEWORK_COMMIT_HASH \
4040
--arg branch {{ FRAMEWORK_GIT_REF }} \
4141
'.[$app] |= if . == null then

build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
--build-arg MPI_IMPLEMENTATION={{ item.1.mpi.implementation }} \
9999
--build-arg MPI_VERSION={{ item.1.mpi.version }} \
100100
--build-arg FRAMEWORK_VERSION={{ item.1.framework.version }} \
101-
--build-arg FRAMEWORK_GIT_REF={{ item.1.framework.branch | default('default') }} \
101+
--build-arg FRAMEWORK_GIT_REF={{ item.1.framework.git_ref | default('default') }} \
102102
{{ original_dir }}/containers/basic/{{ item.0 }}.sif \
103103
{{ playbook_dir }}/basic/{{ item.1.framework.definition }}.def
104104
else

config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ containers:
2626
# mpi:
2727
# implementation: openmpi
2828
# version: 4.1.5
29-
# openfoam:
30-
# fork: foam-extend
29+
# framework:
30+
# definition: foam-extend
3131
# version: 5.0
3232
# git_ref: master # optional (default: default)
3333
# This section builds final containers in containers/projects

0 commit comments

Comments
 (0)