diff --git a/.dockerignore b/.dockerignore index 2f30e67a9..27ed9c8c4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -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 diff --git a/docker/actinia-core-alpine/Dockerfile b/docker/actinia-core-alpine/Dockerfile index 90c80c655..deb99b7cb 100644 --- a/docker/actinia-core-alpine/Dockerfile +++ b/docker/actinia-core-alpine/Dockerfile @@ -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 diff --git a/docker/actinia-core-latest/Dockerfile b/docker/actinia-core-latest/Dockerfile index 1d3744c6d..15dc1fc76 100644 --- a/docker/actinia-core-latest/Dockerfile +++ b/docker/actinia-core-latest/Dockerfile @@ -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 diff --git a/docker/actinia-core-latest/grass_addons_list.csv b/docker/actinia-core-latest/grass_addons_list.csv deleted file mode 100644 index d3b71428b..000000000 --- a/docker/actinia-core-latest/grass_addons_list.csv +++ /dev/null @@ -1,5 +0,0 @@ -d.rast.multi,https://github.com/mundialis/d_rast_multi -i.cutlines, -r.mapcalc.tiled, -r.colors.out_sld, -v.centerpoint, diff --git a/docker/actinia-core/Dockerfile b/docker/actinia-core/Dockerfile index 104e8640b..b20ed8589 100644 --- a/docker/actinia-core/Dockerfile +++ b/docker/actinia-core/Dockerfile @@ -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 diff --git a/docker/actinia-core/grass_addons_list.csv b/docker/actinia-core/grass_addons_list.csv deleted file mode 100644 index d3b71428b..000000000 --- a/docker/actinia-core/grass_addons_list.csv +++ /dev/null @@ -1,5 +0,0 @@ -d.rast.multi,https://github.com/mundialis/d_rast_multi -i.cutlines, -r.mapcalc.tiled, -r.colors.out_sld, -v.centerpoint, diff --git a/docker/actinia-core-alpine/grass_addons_list.csv b/docker/grass_addons_list.csv similarity index 97% rename from docker/actinia-core-alpine/grass_addons_list.csv rename to docker/grass_addons_list.csv index 5ebf5846f..c58df90aa 100644 --- a/docker/actinia-core-alpine/grass_addons_list.csv +++ b/docker/grass_addons_list.csv @@ -1,20 +1,17 @@ -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, @@ -22,6 +19,9 @@ 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