Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update geos, proj, and gdal versions; fix issue with which tag gets used #76

Merged
merged 1 commit into from
Feb 1, 2024
Merged

update geos, proj, and gdal versions; fix issue with which tag gets used #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sense 👍

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

Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
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} .
Copy link
Contributor

@vincentsarago vincentsarago Feb 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correctly use the "tag" of the image rather than the full gdal version in the scripts and dockerfiles. I'm unsure how this ever worked.

I don't think the build.sh script is used anymore

Loading