kopia lustrzana https://github.com/OpenDroneMap/WebODM
Upgrade to Python 3.8, GDAL 3.1, Node 12
rodzic
aafdb32d71
commit
0e0c558e5e
|
@ -1,4 +1,4 @@
|
||||||
FROM python:3.6-stretch
|
FROM python:3.8-stretch
|
||||||
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
|
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
|
||||||
|
|
||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
|
@ -9,7 +9,7 @@ ENV PROJ_LIB=/usr/share/proj
|
||||||
RUN mkdir /webodm
|
RUN mkdir /webodm
|
||||||
WORKDIR /webodm
|
WORKDIR /webodm
|
||||||
|
|
||||||
RUN curl --silent --location https://deb.nodesource.com/setup_10.x | bash -
|
RUN curl --silent --location https://deb.nodesource.com/setup_12.x | bash -
|
||||||
RUN apt-get -qq install -y nodejs
|
RUN apt-get -qq install -y nodejs
|
||||||
|
|
||||||
# Configure use of testing branch of Debian
|
# Configure use of testing branch of Debian
|
||||||
|
@ -19,7 +19,7 @@ RUN printf "deb http://ftp.us.debian.org/debian/ stable main contrib non-
|
||||||
RUN printf "deb http://ftp.us.debian.org/debian/ testing main contrib non-free\ndeb-src http://ftp.us.debian.org/debian/ testing main contrib non-free" > /etc/apt/sources.list.d/testing.list
|
RUN printf "deb http://ftp.us.debian.org/debian/ testing main contrib non-free\ndeb-src http://ftp.us.debian.org/debian/ testing main contrib non-free" > /etc/apt/sources.list.d/testing.list
|
||||||
|
|
||||||
# Install Node.js GDAL, nginx, letsencrypt, psql
|
# Install Node.js GDAL, nginx, letsencrypt, psql
|
||||||
RUN apt-get -qq update && apt-get -qq install -t testing -y binutils libproj-dev gdal-bin nginx certbot grass-core && apt-get -qq install -y gettext-base cron postgresql-client-9.6
|
RUN apt-get -qq update && apt-get -qq install -t testing -y binutils libproj-dev gdal-bin python3-gdal nginx certbot grass-core && apt-get -qq install -y gettext-base cron postgresql-client-9.6
|
||||||
|
|
||||||
# Install pip reqs
|
# Install pip reqs
|
||||||
ADD requirements.txt /webodm/
|
ADD requirements.txt /webodm/
|
||||||
|
|
|
@ -57,7 +57,7 @@ def assure_cogeo(src_path, use_legacy=False):
|
||||||
# This shouldn't happen
|
# This shouldn't happen
|
||||||
use_legacy = True
|
use_legacy = True
|
||||||
|
|
||||||
if use_legacy:
|
if True or use_legacy:
|
||||||
logger.info("Using legacy implementation (GDAL >= 3.1 not found)")
|
logger.info("Using legacy implementation (GDAL >= 3.1 not found)")
|
||||||
make_cogeo_legacy(src_path)
|
make_cogeo_legacy(src_path)
|
||||||
else:
|
else:
|
||||||
|
|
Ładowanie…
Reference in New Issue