Skip to content

Commit 77c2c0b

Browse files
committed
Fix build robustness - use absolute paths, mkdir -p, and -j1 for ecflow
1 parent a36160a commit 77c2c0b

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

containers/nos-workflow.def

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,23 @@ From: rockylinux/rockylinux:9
113113
# ============================================================
114114
# BUILD ECFLOW
115115
# ============================================================
116-
mkdir -p /tmp/ecflow_build && cd /tmp/ecflow_build
116+
rm -rf /tmp/ecflow_build
117+
mkdir -p /tmp/ecflow_build
118+
cd /tmp/ecflow_build
117119
wget -O ecflow.tar.gz "https://confluence.ecmwf.int/download/attachments/8650755/ecFlow-${ECFLOW_VERSION}-Source.tar.gz?api=v2"
118-
tar -xvf ecflow.tar.gz && rm ecflow.tar.gz
120+
tar -xvf ecflow.tar.gz
121+
rm ecflow.tar.gz
119122
mv ecFlow* ecflow
120-
cd ecflow && rm -rf build && mkdir build && cd build
123+
rm -rf /tmp/ecflow_build/ecflow/build
124+
mkdir -p /tmp/ecflow_build/ecflow/build
125+
cd /tmp/ecflow_build/ecflow/build
121126
cmake .. -DENABLE_UI=OFF \
122127
-DBoost_ROOT=/usr \
123128
-DENABLE_TESTS=OFF \
124129
-DENABLE_STATIC_BOOST_LIBS=OFF \
125130
-DCMAKE_INSTALL_PREFIX=/opt/ecflow
126-
make -j2 && make install
131+
make -j1
132+
make install
127133
cd /tmp && rm -rf ecflow_build
128134

129135
# Copy netcdf module for cmake
@@ -133,9 +139,10 @@ From: rockylinux/rockylinux:9
133139
# BUILD ADCIRC
134140
# ============================================================
135141
cd /tmp
136-
rm -rf adcirc adcirc_build
142+
rm -rf /tmp/adcirc /tmp/adcirc_build
137143
git clone --depth 1 --branch v${ADCIRC_VERSION} https://github.com/adcirc/adcirc
138-
mkdir adcirc_build && cd adcirc_build
144+
mkdir -p /tmp/adcirc_build
145+
cd /tmp/adcirc_build
139146
export PATH=$PATH:/usr/lib64/openmpi/bin
140147
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64
141148
cmake ../adcirc -DCMAKE_INSTALL_PREFIX=/opt/models/adcirc \
@@ -154,9 +161,10 @@ From: rockylinux/rockylinux:9
154161
# ============================================================
155162
[ -e /usr/bin/python ] || ln -s /usr/bin/python3 /usr/bin/python
156163
cd /tmp
157-
rm -rf schism schism_build
164+
rm -rf /tmp/schism /tmp/schism_build
158165
git clone --depth 1 --branch v${SCHISM_VERSION} https://github.com/schism-dev/schism
159-
mkdir schism_build && cd schism_build
166+
mkdir -p /tmp/schism_build
167+
cd /tmp/schism_build
160168
export PATH=$PATH:/usr/lib64/openmpi/bin
161169
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64
162170
cmake ../schism/src -DCMAKE_INSTALL_PREFIX=/opt/models/schism -DBLD_STANDALONE=ON

0 commit comments

Comments
 (0)