Merge pull request #8 from eWaterCycle/use-extended-bmi

Use extended bmi

Dockerfile

@@ -16,11 +16,9 @@ FROM ubuntu:jammy AS sfincs_container
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt clean && apt autoclean && apt update --fix-missing && apt upgrade -y && apt install -y libnetcdf-dev build-essential autoconf automake libtool gfortran gdb tzdata m4 git
 WORKDIR /usr/src/sfincs
-ARG SFINCS_VERSION=feature/48-extend-bmi-functionality
-RUN git clone -b ${SFINCS_VERSION} https://github.com/Deltares/SFINCS . \
-  && git config --global user.email "[email protected]" && git config --global user.name "Your Name" \
-  # TODO remove this line when that commit is in $SFINCS_VERSION branch
-  && git cherry-pick 2651b47b797c9acd05ccd8e6d737db19b0670217
+ARG SFINCS_REPO=https://github.com/eWaterCycle/SFINCS.git
+ARG SFINCS_BRANCH=patch-bmi
+RUN git clone -b ${SFINCS_BRANCH} ${SFINCS_REPO} .
 WORKDIR /usr/src/sfincs/source
 RUN chmod -R 777 autogen.sh
 # -fallow-argument-mismatch needed for https://github.com/Unidata/netcdf-fortran/issues/212
@@ -31,10 +29,10 @@ RUN autoreconf -ivf && ./autogen.sh && ./configure --disable-openacc && make &&
 # End of copy of Dockerfile at https://github.com/Deltares/SFINCS/blob/feature/48-extend-bmi-functionality/source/Dockerfile
 
 # Inherit from the same base as sfincs to get compatible library versions
-FROM ubuntu:jammy AS sfincs_bmi_container
+# FROM ubuntu:jammy AS sfincs_bmi_container
 
-# Install sfincs
-COPY --from=sfincs_container /usr/local /usr/local
+# # Install sfincs
+# COPY --from=sfincs_container /usr/local /usr/local
 
 # Install build deps (including sfincs` dependency on netcdf)
 RUN apt-get update && apt-get install -qy git build-essential cmake autoconf libtool pkg-config libssl-dev libnetcdf-dev gfortran

README.md

@@ -55,6 +55,7 @@ To rebuild the server without rebuilding Docker image use
 ```sh
 cd src
 mkdir build
+cd build
 cmake ..
 make
 # Start gprc server