mirror
/
chasemapper
kopia lustrzana https://github.com/projecthorus/chasemapper
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #24 from snh/python3 

Docker: Migrate to Python 3
pull/27/head
Mark Jessop 2021-01-02 08:41:48 +10:30 zatwierdzone przez GitHub
rodzic 5f556c6879 626f323ba4
commit 1a717de8de
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 24 dodań i 24 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

48
Dockerfile
Wyświetl plik

@ -10,22 +10,22 @@ RUN apt-get update && \
build-essential \ build-essential \
cmake \ cmake \
libglib2.0-dev \ libglib2.0-dev \
python \ python3 \
python-dateutil \ python3-dateutil \
python-fastkml \ python3-fastkml \
python-flask \ python3-flask \
python-gdal \ python3-gdal \
python-numpy \ python3-numpy \
python-pip \ python3-pip \
python-requests \ python3-requests \
python-serial \ python3-serial \
python-setuptools \ python3-setuptools \
python-shapely \ python3-shapely \
unzip && \ unzip && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install additional Python packages that aren't available through apt-get. # Install additional Python packages that aren't available through apt-get.
RUN pip --no-cache-dir install \ RUN pip3 --no-cache-dir install \
flask-socketio==4.3.2 \ flask-socketio==4.3.2 \
pytz pytz
@ -34,7 +34,7 @@ ADD https://github.com/darksidelemm/cusf_predictor_wrapper/archive/master.zip /r
RUN unzip /root/cusf_predictor_wrapper-master.zip -d /root && \ RUN unzip /root/cusf_predictor_wrapper-master.zip -d /root && \
rm /root/cusf_predictor_wrapper-master.zip && \ rm /root/cusf_predictor_wrapper-master.zip && \
cd /root/cusf_predictor_wrapper-master && \ cd /root/cusf_predictor_wrapper-master && \
python setup.py install && \ python3 setup.py install && \
cd src && \ cd src && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
@ -52,20 +52,20 @@ RUN apt-get update && \
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y \ apt-get install -y \
libglib2.0 \ libglib2.0 \
python \ python3 \
python-dateutil \ python3-dateutil \
python-fastkml \ python3-fastkml \
python-flask \ python3-flask \
python-gdal \ python3-gdal \
python-numpy \ python3-numpy \
python-requests \ python3-requests \
python-serial \ python3-serial \
python-shapely \ python3-shapely \
unzip && \ unzip && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Copy any additional Python packages from the build container. # Copy any additional Python packages from the build container.
COPY --from=build /usr/local/lib/python2.7/dist-packages /usr/local/lib/python2.7/dist-packages COPY --from=build /usr/local/lib/python3.7/dist-packages /usr/local/lib/python3.7/dist-packages
# Copy predictor binary and get_wind_data.py from the build container. # Copy predictor binary and get_wind_data.py from the build container.
COPY --from=build /root/cusf_predictor_wrapper-master/src/build/pred /opt/chasemapper/ COPY --from=build /root/cusf_predictor_wrapper-master/src/build/pred /opt/chasemapper/
@ -76,4 +76,4 @@ COPY . /opt/chasemapper
# Run horusmapper.py. # Run horusmapper.py.
WORKDIR /opt/chasemapper WORKDIR /opt/chasemapper
CMD ["python", "/opt/chasemapper/horusmapper.py"] CMD ["python3", "/opt/chasemapper/horusmapper.py"]