Skip to content

Commit

Permalink
bumps versions and adds libkml
Browse files Browse the repository at this point in the history
  • Loading branch information
goergen95 committed Sep 19, 2024
1 parent 7e3db78 commit 7bf8542
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-mapme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:
branches: [main, master]
env:
tag: 1.3.1
tag: 1.3.2

jobs:

Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/mapme-base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ COPY scripts/install_sysdeps.sh /rocker_scripts/install_sysdeps.sh

RUN chmod +x /rocker_scripts/install_sysdeps.sh

ARG PROJ_VERSION=9.4.1
ARG GEOS_VERSION=3.12.2
ARG GDAL_VERSION=3.9.1
ARG PROJ_VERSION=9.5.0
ARG GEOS_VERSION=3.13.0
ARG GDAL_VERSION=3.9.2
ARG NCPUS=-1

RUN bash /rocker_scripts/install_sysdeps.sh -proj $PROJ_VERSION -geos $GEOS_VERSION -gdal $GDAL_VERSION -ncpus $NCPUS
29 changes: 15 additions & 14 deletions scripts/install_sysdeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ function apt_install() {

apt_install \
libavfilter-dev \
libcairo2-dev \
libblosc-dev \
libcurl4-openssl-dev \
libexpat1-dev \
libpq-dev \
libsqlite3-dev \
libudunits2-dev \
libcairo2-dev \
libblosc-dev \
libcurl4-openssl-dev \
libexpat1-dev \
libpq-dev \
libsqlite3-dev \
libudunits2-dev \
lbzip2 \
libfftw3-dev \
libgsl0-dev \
Expand All @@ -74,20 +74,21 @@ apt_install \
libhdf4-alt-dev \
libhdf5-dev \
libjq-dev \
libkml-dev \
libpq-dev \
libprotobuf-dev \
libnetcdf-dev \
libssl-dev \
libtiff5-dev \
libopenjp2-7-dev \
libopenjp2-7-dev \
libxml2-dev \
libssh2-1-dev \
libgit2-dev \
libtiff-dev \
cmake \
cargo \
locales \
netcdf-bin \
libgit2-dev \
libtiff-dev \
cmake \
cargo \
locales \
netcdf-bin \
postgis \
unixodbc-dev \
protobuf-compiler \
Expand Down

0 comments on commit 7bf8542

Please sign in to comment.