kopia lustrzana https://github.com/OpenDroneMap/ODM
Quick fixes re: PR comments.
rodzic
c13d8cc9cb
commit
890e3a0378
30
Dockerfile
30
Dockerfile
|
@ -5,21 +5,21 @@ FROM packages
|
|||
RUN mkdir /code
|
||||
WORKDIR /code
|
||||
|
||||
# Add repository files
|
||||
ADD ccd_defs_check.py /code/ccd_defs_check.py
|
||||
ADD CMakeLists.txt /code/CMakeLists.txt
|
||||
ADD configure.sh /code/configure.sh
|
||||
ADD /.git/ /code/.git/
|
||||
ADD .gitignore /code/.gitignore
|
||||
ADD .gitmodules /code/.gitmodules
|
||||
ADD /modules/ /code/modules/
|
||||
ADD /opendm/ /code/opendm/
|
||||
ADD /patched_files/ /code/patched_files/
|
||||
ADD run.py /code/run.py
|
||||
ADD /scripts/ /code/scripts/
|
||||
ADD /SuperBuild/cmake/ /code/SuperBuild/cmake/
|
||||
ADD /SuperBuild/CMakeLists.txt /code/SuperBuild/CMakeLists.txt
|
||||
ADD /tests/ /code/tests/
|
||||
# Copy repository files
|
||||
COPY ccd_defs_check.py /code/ccd_defs_check.py
|
||||
COPY CMakeLists.txt /code/CMakeLists.txt
|
||||
COPY configure.sh /code/configure.sh
|
||||
COPY /.git/ /code/.git/
|
||||
COPY .gitignore /code/.gitignore
|
||||
COPY .gitmodules /code/.gitmodules
|
||||
COPY /modules/ /code/modules/
|
||||
COPY /opendm/ /code/opendm/
|
||||
COPY /patched_files/ /code/patched_files/
|
||||
COPY run.py /code/run.py
|
||||
COPY /scripts/ /code/scripts/
|
||||
COPY /SuperBuild/cmake/ /code/SuperBuild/cmake/
|
||||
COPY /SuperBuild/CMakeLists.txt /code/SuperBuild/CMakeLists.txt
|
||||
COPY /tests/ /code/tests/
|
||||
|
||||
# Update submodules
|
||||
RUN git submodule init && git submodule update
|
||||
|
|
|
@ -6,15 +6,14 @@ sudo apt-get update
|
|||
|
||||
echo "Installing Required Requisites"
|
||||
sudo apt-get install -y build-essential \
|
||||
cmake \
|
||||
git \
|
||||
python-pip \
|
||||
libgdal-dev \
|
||||
gdal-bin \
|
||||
libgeotiff-dev \
|
||||
pkg-config -y -qq
|
||||
pkg-config -qq
|
||||
|
||||
echo "Upgrading CMake for MVS-Texturing"
|
||||
echo "Getting CMake 3.1 for MVS-Texturing"
|
||||
sudo apt-get install -y software-properties-common python-software-properties
|
||||
sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
|
||||
sudo apt-get update -y
|
||||
|
@ -38,7 +37,7 @@ sudo apt-get install -y libgtk2.0-dev \
|
|||
libxext-dev \
|
||||
liblapack-dev \
|
||||
libeigen3-dev \
|
||||
libvtk5-dev -y -qq
|
||||
libvtk5-dev -qq
|
||||
|
||||
echo "Removing libdc1394-22-dev due to python opencv issue"
|
||||
sudo apt-get remove libdc1394-22-dev
|
||||
|
@ -64,7 +63,7 @@ echo "Installing Ecto Dependencies"
|
|||
sudo pip install -U catkin-pkg
|
||||
sudo apt-get install -y python-empy \
|
||||
python-nose \
|
||||
python-pyside -y -qq
|
||||
python-pyside -qq
|
||||
|
||||
echo "Installing OpenDroneMap Dependencies"
|
||||
sudo apt-get install -y python-pyexiv2 \
|
||||
|
|
Ładowanie…
Reference in New Issue