drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-22 14:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Homogenize symlinked maps_build and osm-maps path

Browse Source 
Signed-off-by: zyphlar <zyphlar@gmail.com>
This commit is contained in:
zyphlar
2025-10-27 17:25:56 -07:00
parent e6d3e75ed4
commit af5cf0cc4b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/python/maps_generator/var/etc/map_generator.ini.prod
View File

@@ -11,7 +11,7 @@ BUILD_PATH: /root/OM/omim-build-relwithdebinfo
DEBUG: 0 DEBUG: 0
# A main working directory. There is a subdirectory created for each generator run # A main working directory. There is a subdirectory created for each generator run
# which contains the planet and other downloads, temporary build files, logs and completed MWMs. # which contains the planet and other downloads, temporary build files, logs and completed MWMs.
MAIN_OUT_PATH: ${Developer:OMIM_PATH}/../maps_build MAIN_OUT_PATH: /root/OM/osm-maps
# Path for storing caches for nodes, ways, relations. # Path for storing caches for nodes, ways, relations.
# If it's not set then caches are stored inside the directory of the current build. # If it's not set then caches are stored inside the directory of the current build.
# CACHE_PATH: ${Main:MAIN_OUT_PATH}/cache # CACHE_PATH: ${Main:MAIN_OUT_PATH}/cache

2
tools/unix/Dockerfile
View File

@@ -48,7 +48,7 @@ RUN mkdir /root/OM
# When running, bind mount the repo here # When running, bind mount the repo here
RUN mkdir /root/OM/comaps-init RUN mkdir /root/OM/comaps-init
# And a volume to store the large output/temp files here # And a volume to store the large output/temp files here
RUN mkdir /root/OM/maps_build RUN mkdir /root/OM/osm-maps
# And the output of the app build # And the output of the app build
RUN mkdir /root/OM/omim-build-release RUN mkdir /root/OM/omim-build-release
RUN mkdir /root/OM/omim-build-relwithdebinfo RUN mkdir /root/OM/omim-build-relwithdebinfo

8
tools/unix/docker_maps_generator.sh
View File

@@ -30,7 +30,7 @@ echo "<$(date +%T)> Starting..."
# /root/OM/comaps-init # /root/OM/comaps-init
# /root/OM/omim-build-release # /root/OM/omim-build-release
# /root/OM/omim-build-relwithdebinfo # /root/OM/omim-build-relwithdebinfo
# /root/OM/maps_build # /root/OM/osm-maps
# /home/planet # /home/planet
# #
mkdir -p /root/.config/CoMaps # Odd mkdir permission errors in generator_tool in Docker without these mkdir -p /root/.config/CoMaps # Odd mkdir permission errors in generator_tool in Docker without these
@@ -153,12 +153,12 @@ cd /root/OM/comaps-init/tools/python
# rclone --progress copy ~/OM/maps_build/$buildfolder/$builddate r2:$S3_BUCKET/maps/$builddate/ # rclone --progress copy ~/OM/maps_build/$buildfolder/$builddate r2:$S3_BUCKET/maps/$builddate/
else else
echo "<$(date +%T)> No MWM files in ~/OM/maps_build/$buildfolder/$builddate/*.mwm, not uploading maps." echo "<$(date +%T)> No MWM files in ~/OM/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps."
echo "<$(date +%T)> Found: $(ls -alt ~/OM/maps_build/*)" echo "<$(date +%T)> Found: $(ls -alt ~/OM/osm-maps/*)"
fi fi
echo "<$(date +%T)> Temporarily NOT Removing intermediate data..." echo "<$(date +%T)> Temporarily NOT Removing intermediate data..."
#rm -rf ~/OM/maps_build/*/intermediate_data #rm -rf ~/OM/osm-maps/*/intermediate_data
echo "<$(date +%T)> DONE" echo "<$(date +%T)> DONE"

2
tools/unix/run-docker.sh
View File

@@ -60,6 +60,6 @@ docker run \
--ulimit nofile=262144:262144 \ --ulimit nofile=262144:262144 \
-v /media/4tbexternal/comaps-init:/root/OM/comaps-init \ -v /media/4tbexternal/comaps-init:/root/OM/comaps-init \
-v /media/4tbexternal/osm-planet:/home/planet \ -v /media/4tbexternal/osm-planet:/home/planet \
-v /media/4tbexternal/osm-maps:/root/OM/maps_build \ -v /media/4tbexternal/osm-maps:/root/OM/osm-maps \
-it maps_generator \ -it maps_generator \
/root/OM/organicmaps/tools/unix/docker_maps_generator.sh /root/OM/organicmaps/tools/unix/docker_maps_generator.sh