Skip to content

Commit

Permalink
remove Python3 patch and PDAL (OSGeo#373)
Browse files Browse the repository at this point in the history
  • Loading branch information
anikaweinmann authored Feb 24, 2020
1 parent 8903c44 commit 6263ccb
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions docker/alpine/Dockerfile_alpine
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ENV PACKAGES="\
ncurses \
openjpeg \
openblas \
pdal \
#pdal \
py3-numpy \
py3-pillow \
py3-six \
Expand Down Expand Up @@ -84,7 +84,7 @@ ENV GRASS_CONFIG="\
--with-cxx \
--with-proj --with-proj-share=/usr/share/proj \
--with-gdal \
--with-pdal \
#--with-pdal \
--with-python \
--with-geos \
--with-sqlite \
Expand Down Expand Up @@ -132,7 +132,7 @@ ENV GRASS_BUILD_PACKAGES="\
make \
openjpeg-dev \
openblas-dev \
pdal-dev \
#pdal-dev \
postgresql-dev \
proj-dev \
python3-dev \
Expand Down Expand Up @@ -160,11 +160,6 @@ RUN echo "Install main packages";\
COPY . /src/grass_build/
WORKDIR /src/grass_build/

# Python 3.8.1 patch
RUN apk add curl
RUN curl -L https://github.com/mmacata/alpine-python381-patch/releases/download/0.0.0/python3-dev-3.8.1-r1.apk > /src/python3-dev-3.8.1-r1.apk
RUN apk add --allow-untrusted /src/python3-dev-3.8.1-r1.apk

# Configure compile and install GRASS GIS
RUN echo " => Configure and compile grass" && \
/src/grass_build/configure $GRASS_CONFIG && \
Expand Down Expand Up @@ -197,7 +192,7 @@ RUN pip3 install --upgrade pip six grass-session
RUN ln -s /usr/local/grass /usr/local/grass7
RUN ln -s /usr/local/grass `grass --config path`
RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
pdal --version && \
# pdal --version && \
python3 --version

# Python 3.8.1 patch again
Expand Down Expand Up @@ -231,7 +226,7 @@ ENV GRASSBIN="/usr/local/bin/grass" \

# show installed version
RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
pdal --version && \
#pdal --version && \
python3 --version

# Data workdir
Expand Down

0 comments on commit 6263ccb

Please sign in to comment.