Parcourir la source

Dockerfiles: update to grass-session v0.5

Reverting 86ede80860ae07a4eb1f7957bbcfe93f5c73740d and 07c705eb9b430a79c2d0770b17d9413f145c56fd as no longer needed thanks to https://github.com/zarch/grass-session/releases/tag/v0.5
Markus il y a 5 ans
Parent
commit
745ee7ec92

+ 2 - 3
docker/alpine/Dockerfile_alpine

@@ -192,9 +192,8 @@ COPY --from=build /usr/local/bin/grass /usr/local/bin/grass
 COPY --from=build /usr/local/grass* /usr/local/grass/
 # pip 20.0.0 fix
 RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py pip==20.0.2 && rm get-pip.py
-#RUN pip3 install --upgrade pip six grass-session
-RUN apk add git
-RUN pip3 install --upgrade pip six git+git://github.com/zarch/grass-session.git@0b8414c1
+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 && \

+ 1 - 4
docker/alpine/Dockerfile_alpine_latest

@@ -195,10 +195,7 @@ ENV INTEL="" \
 # =====================
 
 # install external Python API
-#RUN pip install grass-session
-# ugly workaround for https://github.com/zarch/grass-session/issues/16
-RUN apk add git
-RUN pip3 install --upgrade pip six git+git://github.com/zarch/grass-session.git@0b8414c1
+RUN pip install grass-session
 
 # set GRASSBIN
 ENV GRASSBIN="/usr/local/bin/grass"

+ 1 - 4
docker/alpine/Dockerfile_alpine_wxgui

@@ -207,10 +207,7 @@ ENV INTEL="" \
 # =====================
 
 # install external Python API
-#RUN pip install grass-session
-# ugly workaround for https://github.com/zarch/grass-session/issues/16
-RUN apk add git
-RUN pip3 install --upgrade pip six git+git://github.com/zarch/grass-session.git@0b8414c1
+RUN pip install grass-session
 
 # set GRASSBIN
 ENV GRASSBIN="/usr/local/bin/grass"

+ 1 - 4
docker/debian/Dockerfile_debian_pdal

@@ -225,10 +225,7 @@ RUN apt-get clean -y
 WORKDIR /scripts
 
 # install external GRASS GIS session Python API
-#RUN pip3 install grass-session
-# ugly workaround for https://github.com/zarch/grass-session/issues/16
-RUN apt-get install git
-RUN pip3 install --upgrade pip3 git+git://github.com/zarch/grass-session.git@0b8414c1
+RUN pip3 install grass-session
 
 # install GRASS GIS extensions
 RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal

+ 1 - 4
docker/ubuntu/Dockerfile_ubuntu_latest_pdal

@@ -171,10 +171,7 @@ RUN apt-get clean -y
 WORKDIR /scripts
 
 # install external GRASS GIS session Python API
-#RUN pip3 install grass-session
-# ugly workaround for https://github.com/zarch/grass-session/issues/16
-RUN apt-get install git
-RUN pip3 install --upgrade pip3 git+git://github.com/zarch/grass-session.git@0b8414c1
+RUN pip3 install grass-session
 
 # install GRASS GIS extensions
 RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal