From 975d1eee1bb4e4da345c7aa709f70a0007f3d824 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Tue, 24 Mar 2020 13:56:07 +0000
Subject: [PATCH] Fixed docker settings.yml

---
 .gitignore           |  1 -
 docker.settings.yaml | 65 --------------------------------------------
 settings.yaml        |  3 +-
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100755 docker.settings.yaml

diff --git a/.gitignore b/.gitignore
index 0c569401..de7b05c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,4 @@ ceres-solver.tar.gz
 *.pyc
 opencv.zip
 settings.yaml
-docker.settings.yaml
 .setupdevenv
\ No newline at end of file
diff --git a/docker.settings.yaml b/docker.settings.yaml
deleted file mode 100755
index 214ad3a5..00000000
--- a/docker.settings.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-# A list of global configuration variables
-# Uncomment lines as needed to edit default settings.
-# Note this only works for settings with default values. Some commands like --rerun <module>
-# or --force-ccd n will have to be set in the command line (if you need to)
-
-# This line is really important to set up properly
-project_path: '/' #DO NOT CHANGE THIS OR DOCKER WILL NOT WORK. It should be '/'
-
-# The rest of the settings will default to the values set unless you uncomment and change them
-#resize_to: 2048
-#start_with: 'resize'
-#end_with: 'odm_orthophoto'
-#rerun_all: False
-#zip_results: False
-#verbose: False
-#time: False
-#use_fixed_camera_params: False
-#use_hybrid_bundle_adjustment: False
-#opensfm_processes: 4 # by default this is set to $(nproc)
-#min_num_features: 4000
-#matcher_threshold: 2.0
-#matcher_ratio: 0.6
-#matcher_neighbors: 8
-#matcher_distance: 0
-#use_pmvs: False # The cmvs/pmvs settings only matter if 'Enabled' is set to True
-#cmvs_maximages: 500
-#pmvs_level: 1
-#pmvs_csize: 2
-#pmvs_threshold: 0.7
-#pmvs_wsize: 7
-#pmvs_min_images: 3
-#pmvs_num_cores: 4 # by default this is set to $(nproc)
-#mesh_size: 100000
-#mesh_octree_depth: 9
-#mesh_samples: 1.0
-#mesh_solver_divide: 9
-#texturing_data_term: 'gmi'
-#texturing_outlier_removal_type: 'gauss_clamping'
-#texturing_skip_visibility_test: False
-#texturing_skip_global_seam_leveling: False
-#texturing_skip_local_seam_leveling: False
-#texturing_skip_hole_filling: False
-#texturing_keep_unseen_faces: False
-#texturing_tone_mapping: 'none'
-#gcp: !!null  # YAML tag for None
-#use_exif: False # Set to True if you have a GCP file (it auto-detects) and want to use EXIF
-#dtm: False      # Use this tag to build a DTM (Digital Terrain Model
-#dsm: False      # Use this tag to build a DSM (Digital Surface Model
-#dem-gapfill-steps: 4
-#dem-resolution: 0.1
-#dem-maxangle:20
-#dem-maxsd: 2.5
-#dem-approximate: False
-#dem-decimation: 1
-#dem-terrain-type: ComplexForest
-#orthophoto_resolution: 20.0 # Pixels/meter
-#orthophoto_target_srs: !!null # Currently does nothing
-#orthophoto_no_tiled: False
-#orthophoto_compression: DEFLATE # Options are [JPEG, LZW, PACKBITS, DEFLATE, LZMA, NONE] Don't change unless you know what you are doing
-#orthophoto_bigtiff: IF_SAFER # Options are [YES, NO, IF_NEEDED, IF_SAFER]
-#build_overviews: FALSE
-#pc-classify: none
-#force_gps: False
-#rectify: False
diff --git a/settings.yaml b/settings.yaml
index 88d03e3e..b1df82ae 100755
--- a/settings.yaml
+++ b/settings.yaml
@@ -5,7 +5,8 @@
 # or --force-ccd n will have to be set in the command line (if you need to)
 
 # This line is really important to set up properly
-project_path:  '' # Example: '/home/user/ODMProjects'
+# For docker builds, this should be "/" (or docker-compose won't work)
+project_path: '/' # Example: '/home/user/ODMProjects'
 
 # The rest of the settings will default to the values set unless you uncomment and change them
 #resize_to: 2048