Merge branch 'main' into fix-codecov

.binder/Dockerfile

@@ -1,15 +1,12 @@
-# currently we haven't published an official hydromt image yet, so for now
-# I import from an export I've put on my own account. this should be moved
-# to the official image as soon as it's published.
-FROM deltares/hydromt:slim as binder
-# Binder hard requires all of these steps when they build the imae
+FROM deltares/hydromt:slim AS binder
+# Binder hard requires all of these steps when they build the image
 # therefore these steps aren't taken sooner
 
-ENV HOME=/home/mambauser \
+ENV HOME=/home/deltares \
     NUMBA_CACHE_DIR=${HOME}/.cahce/numba\
     USE_PYGEOS=0 \
     PYTHONDONTWRITEBYTECODE=1 \
     PYDEVD_DISABLE_FILE_VALIDATION=1
 WORKDIR ${HOME}
-ENTRYPOINT ["micromamba","run","-n","hydromt"]
-CMD ["jupyter","notebook","--port=8888","--ip=0.0.0.0"]
+ENTRYPOINT ["pixi", "run", "-e", "slim-py311"]
+CMD ["pixi", "run", "-e", "slim-py311","jupyter","notebook","--port=8888","--ip=0.0.0.0"]

Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:bookworm-slim AS base
 ARG PIXIENV
-RUN apt-get update && apt-get install -y curl && apt clean && useradd deltares
+RUN apt-get update && apt-get install -y curl && apt clean && useradd deltares --uid 1000
 
 USER deltares
 WORKDIR /home/deltares

docs/changelog.rst

@@ -20,6 +20,7 @@ Changed
 Fixed
 -----
 - Fixed incorrect arguments causing crashes in ``geom_component._region_data()`` (#1091)
+- Fixed binder integration dockerfile (#1098)
 
 Deprecated
 ----------