diff --git a/tests/TestCompose_su2-ccx/Dockerfile.tutorial_data b/tests/TestCompose_su2-ccx/Dockerfile.tutorial_data index ece776d60..001e336ae 100644 --- a/tests/TestCompose_su2-ccx/Dockerfile.tutorial_data +++ b/tests/TestCompose_su2-ccx/Dockerfile.tutorial_data @@ -4,9 +4,9 @@ RUN apk add git bash ARG branch=develop RUN git clone --branch $branch https://github.com/precice/tutorials -RUN mkdir configs && sed -e 's|exchange-directory="../"|exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g'\ - $tutorial_path/precice-config_serial.xml > configs/precice-config.xml -RUN rm $tutorial_path/precice-config_serial.xml $tutorial_path/precice-config.xml +RUN mkdir configs && sed -e 's|exchange-directory="../"|exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g'\ + $tutorial_path/precice-config.xml > configs/precice-config.xml +RUN rm $tutorial_path/precice-config.xml RUN cp $tutorial_path/config.yml configs/ RUN addgroup -g 1000 precice && adduser -u 1000 -G precice -D precice && chown -R precice:precice tutorials configs USER precice diff --git a/tests/TestCompose_su2-ccx/docker-compose.yml b/tests/TestCompose_su2-ccx/docker-compose.yml index 93684264e..f1aaba684 100644 --- a/tests/TestCompose_su2-ccx/docker-compose.yml +++ b/tests/TestCompose_su2-ccx/docker-compose.yml @@ -1,8 +1,8 @@ version : '3' services: - calculix-adapter: + calculix-adapter: image: "${SYSTEST_REMOTE}calculix-adapter${PRECICE_BASE}:${CALCULIX_TAG}" - networks: + networks: - precicecomm volumes: - exchange:/home/precice/Data/Exchange/ @@ -10,9 +10,9 @@ services: - input_solid:/home/precice/Data/Input/ - configs:/home/precice/calculix-adapter/configs command: > - /bin/bash -c "ln -sf /home/precice/Data/Input Solid; + /bin/bash -c "ln -sf /home/precice/Data/Input Solid; ln -sf /home/precice/calculix-adapter/configs/* . && - ccx_preCICE -i Solid/flap -precice-participant Calculix && + ccx_preCICE -i Solid/flap -precice-participant Calculix > /dev/null 2>&1 && cp Solid/*.dat Solid/*.cvg Solid/*.sta *.log *.out /home/precice/Data/Output/" container_name: calculix-adapter depends_on: @@ -20,20 +20,20 @@ services: su2-adapter: image: "${SYSTEST_REMOTE}su2-adapter${PRECICE_BASE}:${SU2_TAG}" - networks: + networks: - precicecomm volumes: - exchange:/home/precice/Data/Exchange/ - output:/home/precice/Data/Output/ - input_fluid:/home/precice/Data/Input/ - configs:/home/precice/su2-adapter/configs - command: > - /bin/bash -c "ln -sf /home/precice/Data/Input Fluid && + command: > + /bin/bash -c "ln -sf /home/precice/Data/Input Fluid && ln -sf /home/precice/su2-adapter/configs/* . && SU2_CFD Fluid/euler_config_coupled.cfg && cp flow*.vtk *.csv *.dat *SU2*.log /home/precice/Data/Output/" container_name: su2-adapter - depends_on: + depends_on: - tutorial-data tutorial-data: @@ -45,7 +45,7 @@ services: - input_fluid:/tutorials/FSI/flap_perp/SU2-CalculiX/Fluid - configs:/configs/ - output:/Output/ - container_name: tutorial-data + container_name: tutorial-data networks: precicecomm: