Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmacata
mmacata committed Dec 17, 2020
2 parents fb4dcb0 + d6de7bc commit 4b7f20c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
24 changes: 12 additions & 12 deletions docker/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# actinia version matrix

| docker image | actinia-core | actinia-core-latest | actinia-core-dev | actinia-core-prod |
|---------------|------------------------------------------|------------------------------------------|------------------------|-----------------------------|
| base image | mundialis/grass-py3-pdal:stable-ubuntu19 | mundialis/grass-py3-pdal:latest-ubuntu19 | mundialis/actinia-core | mundialis/actinia-core:0.99 |
| [dockerhub tag](https://hub.docker.com/repository/docker/mundialis/actinia-core/tags) | mundialis/actinia:stable | mundialis/actinia:latest | | |
| Linux version | Ubuntu 19.10 | Ubuntu 19.10 | | |
| GRASS GIS | 7.8.x | 7.9.x | ? | ? |
| GDAL | 2.4.2 | 2.4.2 | | |
| PROJ | 5.2.0 | 5.2.0 | | |
| PDAL | 1.9.1 | 1.9.1 | | |
| Python | 3.7.5 | 3.7.5 | | |

Latest update: 7 Jan 2020
| docker image | actinia-core | actinia-core-latest | actinia-core-dev | actinia-core-prod |
|---------------|----------------------------------------|------------------------------------------|------------------------|-----------------------------|
| base image | mundialis/grass-py3-pdal:stable-ubuntu | mundialis/grass-py3-pdal:latest-ubuntu | mundialis/actinia-core | mundialis/actinia-core:0.99 |
| [dockerhub tag](https://hub.docker.com/repository/docker/mundialis/actinia-core/tags) | mundialis/actinia:stable | mundialis/actinia:latest | | |
| Linux version | Ubuntu 20.04 | Ubuntu 20.04 | | |
| GRASS GIS | 7.8.x | 7.9.x | | |
| GDAL | 3.0.4 | 3.0.4 | | |
| PROJ | 6.3.1 | 6.3.1 | | |
| PDAL | 2.2.0 | 2.2.0 | | |
| Python | 3.8.5 | 3.8.5 | | |

Latest update: 16 Dec 2020

# Requirements

Expand Down
8 changes: 4 additions & 4 deletions docker/actinia-core-ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mundialis/grass-py3-pdal:latest-ubuntu19
FROM mundialis/grass-py3-pdal:stable-ubuntu

# based on GRASS GIS master (grass79)

LABEL authors="Carmen Tawalika,Anika Bettge,Markus Neteler,Sören Gebbert"
LABEL maintainer="[email protected],bettge@mundialis.de,[email protected],[email protected]"
LABEL authors="Carmen Tawalika,Anika Weinmann,Markus Neteler,Sören Gebbert"
LABEL maintainer="[email protected],weinmann@mundialis.de,[email protected],[email protected]"

ENV GDAL_CACHEMAX=2000
ENV GRASS_COMPRESSOR=ZSTD
Expand Down Expand Up @@ -62,7 +62,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
pdal --version && \
python3 --version

# Install selected GRASS GIS addons. Done with -s, so it can be used globally
# Install selected GRASS GIS addons. Done with -s, so it can be used by actinia
# https://grass.osgeo.org/grass79/manuals/g.extension.html
# -s uses $GISBASE instead of $GRASS_ADDON_BASE
WORKDIR /src
Expand Down
1 change: 1 addition & 0 deletions src/actinia_core/resources/vector_layer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class VectorInfoModel(Schema):
'points': {'type': 'string'},
'primitives': {'type': 'string'},
'projection': {'type': 'string'},
'zone': {'type': 'string'},
'scale': {'type': 'string'},
'source_date': {'type': 'string'},
'south': {'type': 'string'},
Expand Down

0 comments on commit 4b7f20c

Please sign in to comment.