Updated portable dockerfile, configure script

pull/1156/head
Piero Toffanin 2020-09-16 10:04:51 -04:00
rodzic 7beeafc1ea
commit 5a9c787e20
2 zmienionych plików z 24 dodań i 87 usunięć

Wyświetl plik

@ -99,15 +99,27 @@ install() {
pip install -r requirements.txt
if [ ! -z "$PORTABLE_INSTALL" ]; then
echo "Replacing g++ and gcc with our scripts for portability..."
if [ ! -e /usr/bin/gcc_real ]; then
sudo mv -v /usr/bin/gcc /usr/bin/gcc_real
sudo cp -v ./docker/gcc /usr/bin/gcc
fi
if [ ! -e /usr/bin/g++_real ]; then
sudo mv -v /usr/bin/g++ /usr/bin/g++_real
sudo cp -v ./docker/g++ /usr/bin/g++
fi
fi
echo "Compiling SuperBuild"
# cd ${RUNPATH}/SuperBuild
# mkdir -p build && cd build
# cmake .. && make -j$processes
cd ${RUNPATH}/SuperBuild
mkdir -p build && cd build
cmake .. && make -j$processes
echo "Compiling build"
# cd ${RUNPATH}
# mkdir -p build && cd build
# cmake .. && make -j$processes
cd ${RUNPATH}
mkdir -p build && cd build
cmake .. && make -j$processes
echo "Configuration Finished"
}

Wyświetl plik

@ -1,93 +1,18 @@
FROM phusion/baseimage:0.10.2 as base
FROM ubuntu:18.04
# Env variables
ENV DEBIAN_FRONTEND noninteractive
ENV PYTHONPATH "$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages"
ENV PYTHONPATH "$PYTHONPATH:/code/SuperBuild/src/opensfm"
ENV LD_LIBRARY_PATH "$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
#Install dependencies and required requisites
RUN add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable \
&& add-apt-repository -y ppa:george-edison55/cmake-3.x \
&& apt-get update -y \
&& apt-get install --no-install-recommends -y \
build-essential \
cmake \
gdal-bin \
git \
libatlas-base-dev \
libavcodec-dev \
libavformat-dev \
libboost-date-time-dev \
libboost-filesystem-dev \
libboost-iostreams-dev \
libboost-log-dev \
libboost-python-dev \
libboost-regex-dev \
libboost-thread-dev \
libeigen3-dev \
libflann-dev \
libgdal-dev \
libgeotiff-dev \
libgoogle-glog-dev \
libgtk2.0-dev \
libjasper-dev \
libjpeg-dev \
libjsoncpp-dev \
liblapack-dev \
liblas-bin \
libpng-dev \
libproj-dev \
libsuitesparse-dev \
libswscale-dev \
libtbb2 \
libtbb-dev \
libtiff-dev \
libvtk6-dev \
libxext-dev \
python-dev \
python-gdal \
python-matplotlib \
python-pip \
python-software-properties \
python-wheel \
software-properties-common \
swig2.0 \
grass-core \
libssl-dev \
&& apt-get remove libdc1394-22-dev \
&& pip install --upgrade pip \
&& pip install setuptools
# Prepare directories
WORKDIR /code
# Copy everything
COPY . ./
RUN pip install -r requirements.txt \
&& pip install --upgrade cryptography \
&& python -m easy_install --upgrade pyOpenSSL
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
# Replace g++ and gcc with our own scripts
COPY /docker/ /code/docker/
RUN mv -v /usr/bin/gcc /usr/bin/gcc_real \
&& mv -v /usr/bin/g++ /usr/bin/g++_real \
&& cp -v /code/docker/gcc /usr/bin/gcc \
&& cp -v /code/docker/g++ /usr/bin/g++
# Compile code in SuperBuild and root directories
RUN cd SuperBuild \
&& mkdir build \
&& cd build \
&& cmake .. \
&& make -j$(nproc) \
&& cd ../.. \
&& mkdir build \
&& cd build \
&& cmake .. \
&& make -j$(nproc)
RUN PORTABLE_INSTALL=YES bash configure.sh install
# Cleanup APT
RUN apt-get clean \
@ -105,5 +30,5 @@ RUN rm -rf \
/code/SuperBuild/src/pdal
# Entry point
ENTRYPOINT ["python", "/code/run.py"]
ENTRYPOINT ["python3", "/code/run.py"]