merged develop

Author: GinaStavropoulou

CHANGELOG.md

@@ -4,10 +4,9 @@ For the changes in the 3DBAG data set, see the [3DBAG release notes](https://doc
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [2025.02.25]
-    - Install cjval, val3dity & cjio in tools image (2025.02.25)
-    - Validation resource
-    - test data v9
+## [2025.03.14]
+
+Install cjval, val3dity (2.4.0) & cjio in tools image.
 
 ## [2024.12.16]
 

docker/tools/Dockerfile

@@ -56,7 +56,6 @@ ENV GDAL_DATA=$BAG3D_PIPELINE_LOCATION/tools/share/gdal
 ENV PROJ_DATA=/usr/share/proj
 RUN echo $BAG3D_PIPELINE_LOCATION/tools/lib >> /etc/ld.so.conf.d/3dbag-pipeline-tools.conf
 
-
 FROM tools AS tyler
 ARG JOBS=2
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
@@ -129,10 +128,6 @@ ENV DAGSTER_HOME=/opt/dagster/dagster_home/
 
 RUN mkdir -p $DAGSTER_HOME && \
     touch $DAGSTER_HOME/dagster.yaml
-#RUN useradd -ms /bin/sh -u 1001 bag3d && \
-#    chown -R bag3d /opt/3dbag-pipeline && \
-#    chown -R bag3d $DAGSTER_HOME
-#USER bag3d
 
 # Create a virtual environment, otherwise python complains
 RUN uv venv --python 3.12 $VIRTUAL_ENV

tools-build.sh

@@ -162,12 +162,6 @@ handle_options() {
 handle_options "$@"
 cd $root_dir || exit
 
-# Install Rust and Cargo
-if ! command -v cargo &> /dev/null; then
-  printf "\n\nInstalling Rust and Cargo...\n\n"
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-  source $HOME/.cargo/env
-fi
 
 if [ "$build_tyler" = true ] ; then
   printf "\n\nInstalling Tyler...\n\n"