From 0bee4e074ecf62a8a3d876ccd0a57096c8e4a8e6 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 6 Sep 2025 09:51:50 +0000 Subject: [PATCH] [generator] Add git to mapmaker docker Signed-off-by: Konstantin Pastbin --- tools/unix/Dockerfile | 1 + tools/unix/docker_maps_generator.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tools/unix/Dockerfile b/tools/unix/Dockerfile index 2369b3cfa..bc2f5d28c 100755 --- a/tools/unix/Dockerfile +++ b/tools/unix/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update -qq \ openssh-client \ sshpass \ vim \ + git \ wget \ build-essential \ clang \ diff --git a/tools/unix/docker_maps_generator.sh b/tools/unix/docker_maps_generator.sh index f4464d47c..41700cbb3 100755 --- a/tools/unix/docker_maps_generator.sh +++ b/tools/unix/docker_maps_generator.sh @@ -56,6 +56,10 @@ mkdir -p /home/planet/subway export SKIP_MAP_DOWNLOAD=1 export SKIP_GENERATE_SYMBOLS=1 +# Temporary workaround for dubios ownership / permissions +# build_omim.sh script calls configure.sh which runs git submodule update +git config --global --add safe.directory /root/OM/organicmaps + echo "<$(date +%T)> Compiling tools..." cd ~/OM/organicmaps ./tools/unix/build_omim.sh -R generator_tool