Skip to content

Merge Pc 2025.08.08 #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 15, 2025
Merged

Merge Pc 2025.08.08 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ab8faa
Merge pull request #264 from 3DBAG/develop
GinaStavropoulou Aug 12, 2025
2abf0df
Update tools
Ylannl Aug 15, 2025
d961cb5
Merge branch 'tools-2025-08-15' into pc-2025.08.08
Ylannl Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/pipeline/bag3d-core.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM 3dgi/3dbag-pipeline-tools:2025.08.07 AS develop
FROM 3dgi/3dbag-pipeline-tools:2025.08.15 AS develop
ARG VERSION=develop
ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline

Expand Down
2 changes: 1 addition & 1 deletion docker/pipeline/bag3d-floors-estimation.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM 3dgi/3dbag-pipeline-tools:2025.08.07 AS develop
FROM 3dgi/3dbag-pipeline-tools:2025.08.15 AS develop
ARG VERSION=develop
ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline

Expand Down
2 changes: 1 addition & 1 deletion docker/pipeline/bag3d-party-walls.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM 3dgi/3dbag-pipeline-tools:2025.08.07 AS develop
FROM 3dgi/3dbag-pipeline-tools:2025.08.15 AS develop
ARG VERSION=develop
ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline

Expand Down
16 changes: 8 additions & 8 deletions docker/tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ FROM roofer AS geoflow-old
ARG JOBS=2
ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline

COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/bin/geof $BAG3D_PIPELINE_LOCATION/tools/bin/geof
COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /export /export
COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/src/FileGDB/lib/. /usr/local/src/FileGDB/lib
COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/libfgdbunixrtl.so /usr/local/lib/libfgdbunixrtl.so
COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/LASlib /export/usr/local/lib/
COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/gdalplugins /export/usr/local/lib/
COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/geoflow-plugins/. $BAG3D_PIPELINE_LOCATION/tools/share/geoflow-bundle/plugins
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /usr/local/bin/geof $BAG3D_PIPELINE_LOCATION/tools/bin/geof
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /export /export
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /usr/local/src/FileGDB/lib/. /usr/local/src/FileGDB/lib
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /usr/local/lib/libfgdbunixrtl.so /usr/local/lib/libfgdbunixrtl.so
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /usr/local/lib/LASlib /export/usr/local/lib/
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /usr/local/lib/gdalplugins /export/usr/local/lib/
COPY --from=3dgi/geoflow-bundle-builder:2025.08.15 /usr/local/lib/geoflow-plugins/. $BAG3D_PIPELINE_LOCATION/tools/share/geoflow-bundle/plugins
ENV GF_PLUGIN_FOLDER=$BAG3D_PIPELINE_LOCATION/tools/share/geoflow-bundle/plugins

RUN echo /export/usr/local/lib >> /etc/ld.so.conf.d/geoflow.conf; \
Expand Down Expand Up @@ -160,4 +160,4 @@ RUN rm -rf $HOME/.cache/*; \
apt-get -y clean; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;

RUN bash $BAG3D_PIPELINE_LOCATION/tools-test.sh --dir $BAG3D_PIPELINE_LOCATION/tools
RUN bash $BAG3D_PIPELINE_LOCATION/tools-test.sh --dir $BAG3D_PIPELINE_LOCATION/tools
Loading