Skip to content

Commit

Permalink
Merge pull request #76 from philvarner/pv/update-versions-2024-01-31
Browse files Browse the repository at this point in the history
update geos, proj, and gdal versions; fix issue with which tag gets used
  • Loading branch information
vincentsarago committed Feb 1, 2024
2 parents f55e420 + 78cc483 commit 062a7f5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
pull_request:

env:
GDAL_VERSION: 3.8.2
GDAL_VERSION: 3.8.3
GDAL_VERSION_TAG: 3.8

jobs:
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RUN mkdir /tmp/openjpeg \
&& rm -rf /tmp/openjpeg

# geos
ENV GEOS_VERSION=3.11.2
ENV GEOS_VERSION=3.12.1
RUN mkdir /tmp/geos \
&& curl -sfL https://github.com/libgeos/geos/archive/refs/tags/${GEOS_VERSION}.tar.gz | tar zxf - -C /tmp/geos --strip-components=1 \
&& cd /tmp/geos \
Expand All @@ -207,7 +207,7 @@ RUN mkdir /tmp/geos \
# && make -j $(nproc) --silent && make install \
# && rm -rf /tmp/proj

ENV PROJ_VERSION=9.2.0
ENV PROJ_VERSION=9.3.1
RUN mkdir /tmp/proj && mkdir /tmp/proj/data \
&& curl -sfL https://github.com/OSGeo/proj/archive/${PROJ_VERSION}.tar.gz | tar zxf - -C /tmp/proj --strip-components=1 \
&& cd /tmp/proj \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/runtimes/nodejs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG GDAL_VERSION
ARG GDAL_VERSION_TAG
ARG RUNTIME_VERSION

FROM ghcr.io/lambgeo/lambda-gdal:${GDAL_VERSION} as gdal
FROM ghcr.io/lambgeo/lambda-gdal:${GDAL_VERSION_TAG} as gdal

FROM public.ecr.aws/lambda/nodejs:${RUNTIME_VERSION}

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/runtimes/python
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG GDAL_VERSION
ARG GDAL_VERSION_TAG
ARG RUNTIME_VERSION

FROM ghcr.io/lambgeo/lambda-gdal:${GDAL_VERSION} as gdal
FROM ghcr.io/lambgeo/lambda-gdal:${GDAL_VERSION_TAG} as gdal

FROM public.ecr.aws/lambda/python:${RUNTIME_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docker buildx build \

docker buildx build \
--platform=linux/amd64 \
--build-arg GDAL_VERSION=${GDAL_VERSION} \
--build-arg GDAL_VERSION_TAG=${GDAL_VERSION_TAG} \
--build-arg RUNTIME_VERSION=${RUNTIME_VERSION} \
-f dockerfiles/runtimes/${RUNTIME} \
-t ghcr.io/lambgeo/lambda-gdal:${GDAL_VERSION_TAG}-${RUNTIME}${RUNTIME_VERSION} .

0 comments on commit 062a7f5

Please sign in to comment.