Merge pull request #120 from 3DBAG/update-images

Update images
3DBAG · Dec 6, 2024 · 827e8ef · 827e8ef
2 parents 2370454 + f2814e0
commit 827e8ef
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 44 deletions.
diff --git a/.github/workflows/integration-tests.yaml → .github/workflows/test.yaml b/.github/workflows/integration-tests.yaml → .github/workflows/test.yaml
@@ -1,4 +1,4 @@
-name: Integration tests
+name: Test
 
 on:
   pull_request:
@@ -30,5 +30,12 @@ jobs:
         make download
         make docker_volume_create
         make docker_up
+    - name: Run unit tests
+      run: make test
+    - name: Recreate volumes
+      run: |
+        make docker_down
+        make docker_volume_recreate
+        make docker_up_nobuild
     - name: Run integration tests
       run: make test_integration
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
diff --git a/docker/compose.yaml b/docker/compose.yaml
@@ -27,10 +27,10 @@ services:
     container_name: bag3d-data-postgresql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d ${BAG3D_PG_DATABASE}"]
-      interval: 7s
-      retries: 7
-      start_period: 60s
-      timeout: 30s
+      interval: 3s
+      retries: 10
+      start_period: 30s
+      timeout: 10s
     shm_size: '1gb' 
     ports:
       - "${BAG3D_PG_PORT_ON_HOST}:5432"

diff --git a/docker/pipeline/bag3d-core.dockerfile b/docker/pipeline/bag3d-core.dockerfile
@@ -1,4 +1,4 @@
-FROM 3dgi/3dbag-pipeline-tools:2024.12.05 AS develop
+FROM 3dgi/3dbag-pipeline-tools:2024.12.05-1 AS develop
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 
 LABEL org.opencontainers.image.authors="Balázs Dukai <balazs.dukai@3dgi.nl>"

diff --git a/docker/pipeline/bag3d-floors-estimation.dockerfile b/docker/pipeline/bag3d-floors-estimation.dockerfile
@@ -1,4 +1,4 @@
-FROM 3dgi/3dbag-pipeline-tools:2024.12.05 AS develop
+FROM 3dgi/3dbag-pipeline-tools:2024.12.05-1 AS develop
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 
 LABEL org.opencontainers.image.authors="Balázs Dukai <balazs.dukai@3dgi.nl>"

diff --git a/docker/pipeline/bag3d-party-walls.dockerfile b/docker/pipeline/bag3d-party-walls.dockerfile
@@ -1,4 +1,4 @@
-FROM 3dgi/3dbag-pipeline-tools:2024.12.05 AS develop
+FROM 3dgi/3dbag-pipeline-tools:2024.12.05-1 AS develop
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 
 LABEL org.opencontainers.image.authors="Balázs Dukai <balazs.dukai@3dgi.nl>"

diff --git a/makefile b/makefile
@@ -43,6 +43,9 @@ docker_up_postgres:
 docker_up:
 	BAG3D_DOCKER_IMAGE_TAG=$(BAG3D_DOCKER_IMAGE_TAG) docker compose -p $(COMPOSE_PROJECT_NAME) -f docker/compose.yaml up -d
 
+docker_up_nobuild:
+	BAG3D_DOCKER_IMAGE_TAG=$(BAG3D_DOCKER_IMAGE_TAG) docker compose -p $(COMPOSE_PROJECT_NAME) -f docker/compose.yaml up -d --no-build
+
 docker_watch:
 	BAG3D_DOCKER_IMAGE_TAG=$(BAG3D_DOCKER_IMAGE_TAG) docker compose -p $(COMPOSE_PROJECT_NAME) -f docker/compose.yaml watch
 

diff --git a/packages/common/src/bag3d/common/resources/__init__.py b/packages/common/src/bag3d/common/resources/__init__.py
@@ -50,7 +50,7 @@
     data_dir=str(Path(os.getenv("BAG3D_FILESTORE")) / "integration_core")
 )
 
-# Configure for gilfoyle
+# Configure for  gilfoyle
 file_store_gilfoyle = FileStoreResource(data_dir="/data")
 file_store_gilfoyle_fastssd = FileStoreResource(data_dir="/fastssd/data")
 

diff --git a/packages/core/src/bag3d/core/assets/reconstruction/reconstruction.py b/packages/core/src/bag3d/core/assets/reconstruction/reconstruction.py
@@ -179,7 +179,8 @@ def create_roofer_config(
     source = {ahn5_files}
 
     [output-attributes]
-    status = "b3_status"
+    success = "b3_status"
+    extrusion_mode = "b3_extrusiemodus"
     reconstruction_time = "b3_t_run"
     val3dity_lod12 = "b3_val3dity_lod12"
     val3dity_lod13 = "b3_val3dity_lod13"