Skip to content

Commit 1330eb1

Browse files
authored
Better code understanding: move dm to micmac
To be tested: Better code understanding: move dm to micmac
2 parents 9ae2d16 + fe9007f commit 1330eb1

File tree

17 files changed

+11
-11
lines changed

17 files changed

+11
-11
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ RUN mkdir -p tmp /code
4848
RUN mkdir -p /code
4949

5050
# Build MicMac
51-
RUN git clone --depth 1 https://github.com/OpenDroneMap/micmac
52-
RUN cd micmac && \
51+
RUN git clone --depth 1 https://github.com/OpenDroneMap/micmac micmac-build
52+
RUN cd micmac-build && \
5353
rm -rf build && mkdir build && cd build && \
5454
cmake \
5555
-DBUILD_POISSON=0 \
@@ -72,14 +72,14 @@ ENV python "$(which python3)"
7272
RUN figlet -f slant NodeMICMAC
7373

7474
RUN mkdir -p /code/opendm
75-
COPY dm/opendm /code/opendm
76-
COPY dm/odm_options.json /code
77-
COPY dm/settings.yaml /code
78-
COPY dm/VERSION /code
79-
COPY dm/run.sh /code
80-
COPY dm/run.py /code
81-
82-
RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac
75+
COPY micmac/opendm /code/opendm
76+
COPY micmac/odm_options.json /code
77+
COPY micmac/settings.yaml /code
78+
COPY micmac/VERSION /code
79+
COPY micmac/run.sh /code
80+
COPY micmac/run.py /code
81+
82+
RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac-build
8383

8484
WORKDIR "/var/www"
8585

dm/VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

micmac/VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.beta4
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)