Skip to content

Commit

Permalink
Merge pull request #81 from mmacata/sync_grass_addons_lists
Browse files Browse the repository at this point in the history
Sync grass_addons_list.csv in Dockerfiles
  • Loading branch information
mmacata authored Feb 7, 2020
2 parents a0a2b8c + 3330f07 commit cf23310
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 26 deletions.
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
docker
!docker/grass_addons_list.csv
!docker/actinia-core/snap
!docker/actinia-core/actinia.cfg
!docker/actinia-core/grass_addons_list.csv
!docker/actinia-core/start.sh
!docker/actinia-core/start-dev.sh
!docker/actinia-core-latest/snap
!docker/actinia-core-latest/actinia.cfg
!docker/actinia-core-latest/grass_addons_list.csv
!docker/actinia-core-dev/actinia.cfg
!docker/actinia-core-prod/actinia.cfg
!docker/actinia-core-latest/start.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/actinia-core-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

# GRASS GIS addons BUILD
RUN git clone https://github.com/mundialis/openeo-addons.git /src/openeo-addons
COPY docker/actinia-core/grass_addons_list.csv /src/grass_addons_list.csv
COPY docker/grass_addons_list.csv /src/grass_addons_list.csv
# TODO: remove patch when python 3.8.2 is here
RUN apk add curl
RUN curl -L https://github.com/mmacata/alpine-python381-patch/releases/download/0.0.0/python3-3.8.1-r1.apk > /src/python3-3.8.1-r1.apk
Expand Down
2 changes: 1 addition & 1 deletion docker/actinia-core-latest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
# https://grass.osgeo.org/grass79/manuals/g.extension.html
# -s uses $GISBASE instead of $GRASS_ADDON_BASE
WORKDIR /src
COPY docker/actinia-core-latest/grass_addons_list.csv /src/grass_addons_list.csv
COPY docker/grass_addons_list.csv /src/grass_addons_list.csv
RUN while IFS=, read -r ADDON SERVER; do unset URL; test -z $SERVER || URL="url=$SERVER"; grass --tmp-location EPSG:4326 --exec g.extension -s extension=$ADDON $URL;done < /src/grass_addons_list.csv

# install SNAPPY
Expand Down
5 changes: 0 additions & 5 deletions docker/actinia-core-latest/grass_addons_list.csv

This file was deleted.

2 changes: 1 addition & 1 deletion docker/actinia-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
# https://grass.osgeo.org/grass79/manuals/g.extension.html
# -s uses $GISBASE instead of $GRASS_ADDON_BASE
WORKDIR /src
COPY docker/actinia-core/grass_addons_list.csv /src/grass_addons_list.csv
COPY docker/grass_addons_list.csv /src/grass_addons_list.csv
RUN while IFS=, read -r ADDON SERVER; do unset URL; test -z $SERVER || URL="url=$SERVER"; grass --tmp-location EPSG:4326 --exec g.extension -s extension=$ADDON $URL;done < /src/grass_addons_list.csv

# install SNAPPY
Expand Down
5 changes: 0 additions & 5 deletions docker/actinia-core/grass_addons_list.csv

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
d.rast.multi,https://github.com/mundialis/d_rast_multi
i.cutlines,
r.mapcalc.tiled,
r.colors.out_sld,
v.centerpoint,
importer,https://github.com/mundialis/importer
exporter,https://github.com/mundialis/exporter
r.neighborhoodmatrix,
i.segment.uspo,
i.cva,
i.segment.stats,
i.segment.uspo,
i.sentinel,
i.cva,
i.cutlines,
r.learn.ml,
r.bioclim,
v.centerpoint,
r.change.info,
r.colors.out_sld,
r.gdd,
r.hants,
r.learn.ml,
r.mapcalc.tiled,
r.neighborhoodmatrix,
r.regression.series,
r.sample.category,
r.seasons,
r.series.lwr,
r.viewshed.cva,
v.strds.stats,
v.surf.mass,
importer,https://github.com/mundialis/importer
exporter,https://github.com/mundialis/exporter
d.rast.multi,https://github.com/mundialis/d_rast_multi
t.rast.sample,https://github.com/mundialis/t.rast.sample
g.region.bbox,/src/openeo-addons/g.region.bbox
r.scaleminmax,/src/openeo-addons/r.scaleminmax
Expand Down

0 comments on commit cf23310

Please sign in to comment.