From cdae890f68e5460a9e966f4c0ca89fccffced518 Mon Sep 17 00:00:00 2001 From: kikislater Date: Tue, 17 Sep 2024 05:56:40 +0000 Subject: [PATCH 1/3] Better code understanding: move dm to micmac --- Dockerfile | 12 ++++++------ {dm => micmac}/VERSION | 0 {dm => micmac}/odm_options.json | 0 {dm => micmac}/opendm/__init__.py | 0 {dm => micmac}/opendm/config.py | 0 {dm => micmac}/opendm/context.py | 0 {dm => micmac}/opendm/gcp.py | 0 {dm => micmac}/opendm/io.py | 0 {dm => micmac}/opendm/location.py | 0 {dm => micmac}/opendm/log.py | 0 {dm => micmac}/opendm/progress.py | 0 {dm => micmac}/opendm/system.py | 0 {dm => micmac}/requirements.txt | 0 {dm => micmac}/run.py | 0 {dm => micmac}/run.sh | 0 {dm => micmac}/settings.yaml | 0 16 files changed, 6 insertions(+), 6 deletions(-) rename {dm => micmac}/VERSION (100%) rename {dm => micmac}/odm_options.json (100%) rename {dm => micmac}/opendm/__init__.py (100%) rename {dm => micmac}/opendm/config.py (100%) rename {dm => micmac}/opendm/context.py (100%) rename {dm => micmac}/opendm/gcp.py (100%) rename {dm => micmac}/opendm/io.py (100%) rename {dm => micmac}/opendm/location.py (100%) rename {dm => micmac}/opendm/log.py (100%) rename {dm => micmac}/opendm/progress.py (100%) rename {dm => micmac}/opendm/system.py (100%) rename {dm => micmac}/requirements.txt (100%) rename {dm => micmac}/run.py (100%) rename {dm => micmac}/run.sh (100%) rename {dm => micmac}/settings.yaml (100%) diff --git a/Dockerfile b/Dockerfile index 5c72c65..e03023c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,12 +72,12 @@ ENV python "$(which python3)" RUN figlet -f slant NodeMICMAC RUN mkdir -p /code/opendm -COPY dm/opendm /code/opendm -COPY dm/odm_options.json /code -COPY dm/settings.yaml /code -COPY dm/VERSION /code -COPY dm/run.sh /code -COPY dm/run.py /code +COPY micmac/opendm /code/opendm +COPY micmac/odm_options.json /code +COPY micmac/settings.yaml /code +COPY micmac/VERSION /code +COPY micmac/run.sh /code +COPY micmac/run.py /code RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac diff --git a/dm/VERSION b/micmac/VERSION similarity index 100% rename from dm/VERSION rename to micmac/VERSION diff --git a/dm/odm_options.json b/micmac/odm_options.json similarity index 100% rename from dm/odm_options.json rename to micmac/odm_options.json diff --git a/dm/opendm/__init__.py b/micmac/opendm/__init__.py similarity index 100% rename from dm/opendm/__init__.py rename to micmac/opendm/__init__.py diff --git a/dm/opendm/config.py b/micmac/opendm/config.py similarity index 100% rename from dm/opendm/config.py rename to micmac/opendm/config.py diff --git a/dm/opendm/context.py b/micmac/opendm/context.py similarity index 100% rename from dm/opendm/context.py rename to micmac/opendm/context.py diff --git a/dm/opendm/gcp.py b/micmac/opendm/gcp.py similarity index 100% rename from dm/opendm/gcp.py rename to micmac/opendm/gcp.py diff --git a/dm/opendm/io.py b/micmac/opendm/io.py similarity index 100% rename from dm/opendm/io.py rename to micmac/opendm/io.py diff --git a/dm/opendm/location.py b/micmac/opendm/location.py similarity index 100% rename from dm/opendm/location.py rename to micmac/opendm/location.py diff --git a/dm/opendm/log.py b/micmac/opendm/log.py similarity index 100% rename from dm/opendm/log.py rename to micmac/opendm/log.py diff --git a/dm/opendm/progress.py b/micmac/opendm/progress.py similarity index 100% rename from dm/opendm/progress.py rename to micmac/opendm/progress.py diff --git a/dm/opendm/system.py b/micmac/opendm/system.py similarity index 100% rename from dm/opendm/system.py rename to micmac/opendm/system.py diff --git a/dm/requirements.txt b/micmac/requirements.txt similarity index 100% rename from dm/requirements.txt rename to micmac/requirements.txt diff --git a/dm/run.py b/micmac/run.py similarity index 100% rename from dm/run.py rename to micmac/run.py diff --git a/dm/run.sh b/micmac/run.sh similarity index 100% rename from dm/run.sh rename to micmac/run.sh diff --git a/dm/settings.yaml b/micmac/settings.yaml similarity index 100% rename from dm/settings.yaml rename to micmac/settings.yaml From dc8bf96874667d8ac2677e1346088d69282d9bfe Mon Sep 17 00:00:00 2001 From: kikislater Date: Tue, 17 Sep 2024 05:58:53 +0000 Subject: [PATCH 2/3] Better code understanding: move dm to micmac --- micmac/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micmac/VERSION b/micmac/VERSION index 8acdd82..51e8fe3 100644 --- a/micmac/VERSION +++ b/micmac/VERSION @@ -1 +1 @@ -0.0.1 +1.0.beta4 From fe9007febbd06797691bf4583fa89a74ce3d8db7 Mon Sep 17 00:00:00 2001 From: kikislater Date: Tue, 17 Sep 2024 06:25:30 +0000 Subject: [PATCH 3/3] Better code understanding: move dm to micmac --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e03023c..7c542b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,8 +48,8 @@ RUN mkdir -p tmp /code RUN mkdir -p /code # Build MicMac -RUN git clone --depth 1 https://github.com/OpenDroneMap/micmac -RUN cd micmac && \ +RUN git clone --depth 1 https://github.com/OpenDroneMap/micmac micmac-build +RUN cd micmac-build && \ rm -rf build && mkdir build && cd build && \ cmake \ -DBUILD_POISSON=0 \ @@ -79,7 +79,7 @@ COPY micmac/VERSION /code COPY micmac/run.sh /code COPY micmac/run.py /code -RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac +RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac-build WORKDIR "/var/www"